From ba45c80d1ca9df3fa76a83c46403bfd74ef49bec Mon Sep 17 00:00:00 2001
From: Daniel Brooks <db48x@db48x.net>
Date: Thu, 9 Sep 2010 20:14:56 -0400
Subject: [PATCH] about:startup - move UI files to toolkit

--HG--
rename : browser/base/content/aboutStartup.js => toolkit/content/aboutStartup.js
rename : browser/base/content/aboutStartup.xhtml => toolkit/content/aboutStartup.xhtml
rename : browser/locales/en-US/chrome/browser/aboutStartup.dtd => toolkit/locales/en-US/chrome/global/aboutStartup.dtd
rename : browser/locales/en-US/chrome/browser/aboutStartup.properties => toolkit/locales/en-US/chrome/global/aboutStartup.properties
---
 browser/base/jar.mn                                           | 2 --
 browser/components/about/AboutRedirector.cpp                  | 2 +-
 browser/locales/jar.mn                                        | 1 -
 {browser/base => toolkit}/content/aboutStartup.js             | 0
 {browser/base => toolkit}/content/aboutStartup.xhtml          | 4 ++--
 toolkit/content/jar.mn                                        | 2 ++
 .../locales/en-US/chrome/global}/aboutStartup.dtd             | 0
 .../locales/en-US/chrome/global}/aboutStartup.properties      | 0
 toolkit/locales/jar.mn                                        | 2 ++
 9 files changed, 7 insertions(+), 6 deletions(-)
 rename {browser/base => toolkit}/content/aboutStartup.js (100%)
 rename {browser/base => toolkit}/content/aboutStartup.xhtml (89%)
 rename {browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/global}/aboutStartup.dtd (100%)
 rename {browser/locales/en-US/chrome/browser => toolkit/locales/en-US/chrome/global}/aboutStartup.properties (100%)

diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index 92abec8ac999..4335d3b049db 100755
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -24,8 +24,6 @@ browser.jar:
         content/browser/aboutRobots-icon-rtl.png      (content/aboutRobots-icon-rtl.png)
         content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
         content/browser/aboutRobots-widget-right.png  (content/aboutRobots-widget-right.png)
-        content/browser/aboutStartup.xhtml            (content/aboutStartup.xhtml)
-        content/browser/aboutStartup.js               (content/aboutStartup.js)
 *       content/browser/browser.css                   (content/browser.css)
 *       content/browser/browser.js                    (content/browser.js)
 *       content/browser/browser.xul                   (content/browser.xul)
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp
index 634e4aa7893c..319afb004178 100755
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -100,7 +100,7 @@ static RedirEntry kRedirMap[] = {
   { "sync-tabs", "chrome://browser/content/aboutSyncTabs.xul",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
-  { "startup", "chrome://browser/content/aboutStartup.html",
+  { "startup", "chrome://toolkit/content/aboutStartup.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
   { "home", "chrome://browser/content/aboutHome.xhtml",
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index d2d869443dbc..fd90434092f4 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -7,7 +7,6 @@
     locale/browser/aboutPrivateBrowsing.dtd        (%chrome/browser/aboutPrivateBrowsing.dtd)
     locale/browser/aboutRobots.dtd                 (%chrome/browser/aboutRobots.dtd)
     locale/browser/aboutHome.dtd                   (%chrome/browser/aboutHome.dtd)
-    locale/browser/aboutStartup.dtd                (%chrome/browser/aboutStartup.dtd)
     locale/browser/aboutSessionRestore.dtd         (%chrome/browser/aboutSessionRestore.dtd)
 #ifdef MOZ_SERVICES_SYNC
     locale/browser/aboutSyncTabs.dtd               (%chrome/browser/aboutSyncTabs.dtd)
diff --git a/browser/base/content/aboutStartup.js b/toolkit/content/aboutStartup.js
similarity index 100%
rename from browser/base/content/aboutStartup.js
rename to toolkit/content/aboutStartup.js
diff --git a/browser/base/content/aboutStartup.xhtml b/toolkit/content/aboutStartup.xhtml
similarity index 89%
rename from browser/base/content/aboutStartup.xhtml
rename to toolkit/content/aboutStartup.xhtml
index db40e3e4f46f..91906327548f 100755
--- a/browser/base/content/aboutStartup.xhtml
+++ b/toolkit/content/aboutStartup.xhtml
@@ -6,7 +6,7 @@
   %globalDTD;
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
-  <!ENTITY % aboutStartupDTD SYSTEM "chrome://browser/locale/aboutStartup.dtd">
+  <!ENTITY % aboutStartupDTD SYSTEM "chrome://global/locale/aboutStartup.dtd">
   %aboutStartupDTD;
 ]>
 
@@ -34,6 +34,6 @@
       <tr><th>&timestamp;</th><th>&eventdesc;</th></tr>
       <tr><td colspan="2"><i>&noevents;</i></td></tr>
     </table>
-    <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutStartup.js"/>
+    <script type="application/javascript;version=1.8" src="chrome://global/content/aboutStartup.js"/>
   </body>
 </html>
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index b3fa319a67f8..f3587741ac93 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -16,6 +16,8 @@ toolkit.jar:
 *  content/global/aboutRights-unbranded.xhtml (aboutRights-unbranded.xhtml)
 *  content/global/aboutSupport.js
 *  content/global/aboutSupport.xhtml
+   content/global/aboutStartup.xhtml          (aboutStartup.xhtml)
+   content/global/aboutStartup.js             (aboutStartup.js)
    content/global/directionDetector.html
    content/global/plugins.html
    content/global/plugins.css
diff --git a/browser/locales/en-US/chrome/browser/aboutStartup.dtd b/toolkit/locales/en-US/chrome/global/aboutStartup.dtd
similarity index 100%
rename from browser/locales/en-US/chrome/browser/aboutStartup.dtd
rename to toolkit/locales/en-US/chrome/global/aboutStartup.dtd
diff --git a/browser/locales/en-US/chrome/browser/aboutStartup.properties b/toolkit/locales/en-US/chrome/global/aboutStartup.properties
similarity index 100%
rename from browser/locales/en-US/chrome/browser/aboutStartup.properties
rename to toolkit/locales/en-US/chrome/global/aboutStartup.properties
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index a554efe77483..79579e9c2314 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -8,6 +8,8 @@
   locale/@AB_CD@/global/aboutRights.properties          (%chrome/global/aboutRights.properties)
   locale/@AB_CD@/global/aboutSupport.dtd                (%chrome/global/aboutSupport.dtd)
   locale/@AB_CD@/global/aboutSupport.properties         (%chrome/global/aboutSupport.properties)
+  locale/@AB_CD@/global/aboutStartup.dtd                (%chrome/global/aboutStartup.dtd)
+  locale/@AB_CD@/global/aboutStartup.properties         (%chrome/global/aboutStartup.properties)
   locale/@AB_CD@/global/actions.dtd                     (%chrome/global/actions.dtd)
   locale/@AB_CD@/global/appPicker.dtd                   (%chrome/global/appPicker.dtd)
   locale/@AB_CD@/global/brand.dtd                       (generic/chrome/global/brand.dtd)