From 0cef82a4c095d4dad3e5b4eb3abf75377b2f43aa Mon Sep 17 00:00:00 2001
From: Daniel Brooks <db48x@db48x.net>
Date: Mon, 15 Nov 2010 07:12:26 -0600
Subject: [PATCH] about:startup - change chrome package name for jquery stuff
 so that it's clear that it's private

---
 toolkit/content/aboutStartup.xhtml |  6 +++---
 toolkit/content/jar.mn             |  2 +-
 xpcom/system/nsIXULRuntime.idl     | 18 +++++++++---------
 3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/toolkit/content/aboutStartup.xhtml b/toolkit/content/aboutStartup.xhtml
index 1f69db0dc1ee..2e25a0011837 100755
--- a/toolkit/content/aboutStartup.xhtml
+++ b/toolkit/content/aboutStartup.xhtml
@@ -51,9 +51,9 @@
     <title>&about.startup.title;</title>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css" type="text/css"/>
     <link rel="stylesheet" href="chrome://global/skin/aboutStartup.css" type="text/css"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.js"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.flot.js"/>
-    <script type="application/javascript" src="chrome://jquery/content/jquery.flot.selection.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.flot.js"/>
+    <script type="application/javascript" src="chrome://unstable-mozilla-private/content/jquery.flot.selection.js"/>
   </head>
 
   <body>
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 07dd4280cc2b..381d028328b4 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -2,7 +2,7 @@ toolkit.jar:
 %  content global %content/global/ contentaccessible=yes
 %  content global-platform %content/global-platform/ platform
 %  content global-region %content/global-region/
-%  content jquery %content/jquery/
+%  content unstable-mozilla-private %content/jquery/
 # provide the nsTransferable in nsDragAndDrop.js to extensions that have to
 # work with Geckos from before 1.9, when there was a separate file
 %  override chrome://global/content/nsTransferable.js chrome://global/content/nsDragAndDrop.js
diff --git a/xpcom/system/nsIXULRuntime.idl b/xpcom/system/nsIXULRuntime.idl
index 10b73682cff0..20b7df3e610a 100755
--- a/xpcom/system/nsIXULRuntime.idl
+++ b/xpcom/system/nsIXULRuntime.idl
@@ -108,6 +108,15 @@ interface nsIXULRuntime : nsISupports
    */
   void invalidateCachesOnRestart();
 
+  /**
+   * Starts a child process. This method is intented to pre-start a
+   * content child process so that when it is actually needed, it is
+   * ready to go.
+   *
+   * @throw NS_ERROR_NOT_AVAILABLE if not available.
+   */
+  void ensureContentProcess();
+
   /**
    * Recorded timestamp indicating when the operating system began launching the app
     */
@@ -117,13 +126,4 @@ interface nsIXULRuntime : nsISupports
    * Recorded timestamp indicating when app startup began (essentially XRE_Main)
     */
   readonly attribute unsigned long long startupTimestamp;
-
-  /**
-   * Starts a child process. This method is intented to pre-start a
-   * content child process so that when it is actually needed, it is
-   * ready to go.
-   *
-   * @throw NS_ERROR_NOT_AVAILABLE if not available.
-   */
-  void ensureContentProcess();
 };
