about:startup - move UI files to toolkit
authorDaniel Brooks <db48x@db48x.net>
Thu, 09 Sep 2010 20:14:56 -0400
changeset 58828 cd418499972c283503aa6517927b04f9b7b8ba73
parent 58827 fbe8fbf75b6f78a7db45a437471b5a478852e00b
child 58829 662106b0a87c7cc2f11bc32f728dccf582729454
push id17440
push userdb48x@yahoo.com
push dateWed, 08 Dec 2010 04:15:54 +0000
treeherdermozilla-central@a89f24bf1798 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b6pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
about:startup - move UI files to toolkit
browser/base/content/aboutStartup.js
browser/base/content/aboutStartup.xhtml
browser/base/jar.mn
browser/components/about/AboutRedirector.cpp
browser/locales/en-US/chrome/browser/aboutStartup.dtd
browser/locales/en-US/chrome/browser/aboutStartup.properties
browser/locales/jar.mn
toolkit/content/aboutStartup.js
toolkit/content/aboutStartup.xhtml
toolkit/content/jar.mn
toolkit/locales/en-US/chrome/global/aboutStartup.dtd
toolkit/locales/en-US/chrome/global/aboutStartup.properties
toolkit/locales/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -19,18 +19,16 @@ browser.jar:
 *       content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
 *       content/browser/aboutHome.xhtml               (content/aboutHome.xhtml)
 *       content/browser/aboutHome.js                  (content/aboutHome.js)
 *       content/browser/aboutHome.css                 (content/aboutHome.css)
         content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
         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)
 *       content/browser/browser-tabPreviews.xml       (content/browser-tabPreviews.xml)
 *       content/browser/credits.xhtml                 (content/credits.xhtml)
 *       content/browser/fullscreen-video.xhtml        (content/fullscreen-video.xhtml)
 *       content/browser/inspector.html                (content/inspector.html)
 *       content/browser/pageinfo/pageInfo.xul         (content/pageinfo/pageInfo.xul)
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -95,17 +95,17 @@ static RedirEntry kRedirMap[] = {
     nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
     nsIAboutModule::ALLOW_SCRIPT },
   { "sessionrestore", "chrome://browser/content/aboutSessionRestore.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #ifdef MOZ_SERVICES_SYNC
   { "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 |
     nsIAboutModule::ALLOW_SCRIPT },
 };
 static const int kRedirTotal = NS_ARRAY_LENGTH(kRedirMap);
 
 static nsCAutoString
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -2,17 +2,16 @@
 
 @AB_CD@.jar:
 % locale browser @AB_CD@ %locale/browser/
     locale/browser/aboutCertError.dtd              (%chrome/browser/aboutCertError.dtd)
     locale/browser/aboutDialog.dtd                 (%chrome/browser/aboutDialog.dtd)
     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)
 #endif
     locale/browser/credits.dtd                     (%chrome/browser/credits.dtd)
 *   locale/browser/browser.dtd                     (%chrome/browser/browser.dtd)
     locale/browser/baseMenuOverlay.dtd             (%chrome/browser/baseMenuOverlay.dtd)
     locale/browser/browser.properties              (%chrome/browser/browser.properties)
rename from browser/base/content/aboutStartup.js
rename to toolkit/content/aboutStartup.js
rename from browser/base/content/aboutStartup.xhtml
rename to toolkit/content/aboutStartup.xhtml
--- a/browser/base/content/aboutStartup.xhtml
+++ b/toolkit/content/aboutStartup.xhtml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html [
   <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
   %htmlDTD;
   <!ENTITY % globalDTD SYSTEM "chrome://global/locale/global.dtd">
   %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;
 ]>
 
 <html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <title>&title;</title>
     <link rel="stylesheet" href="chrome://global/skin/aboutSupport.css" type="text/css"/>
   </head>
@@ -29,11 +29,11 @@
     <table>
       <tr><th>&timestamp;</th><th>&launchdur;</th><th>&startupdur;</th><th>&elapsed;</th><th colspan="4">&version;</th></tr>
       <tr><td colspan="8"><i>&noevents;</i></td></tr>
     </table>
     <table>
       <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>
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -11,16 +11,18 @@ toolkit.jar:
    content/global/textbox.css                 (textbox.css)
    content/global/menulist.css                (menulist.css)
 *  content/global/about.xhtml                 (about.xhtml)
 *  content/global/aboutAbout.xhtml            (aboutAbout.xhtml)
 *  content/global/aboutRights.xhtml           (aboutRights.xhtml)
 *  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
 *+  content/global/buildconfig.html            (buildconfig.html)
 +  content/global/charsetOverlay.js           (charsetOverlay.js)
 +  content/global/charsetOverlay.xul          (charsetOverlay.xul)
 *  content/global/contentAreaUtils.js         (contentAreaUtils.js)
 *  content/global/customizeCharset.js         (customizeCharset.js)
rename from browser/locales/en-US/chrome/browser/aboutStartup.dtd
rename to toolkit/locales/en-US/chrome/global/aboutStartup.dtd
rename from browser/locales/en-US/chrome/browser/aboutStartup.properties
rename to toolkit/locales/en-US/chrome/global/aboutStartup.properties
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -3,16 +3,18 @@
 @AB_CD@.jar:
 % locale global @AB_CD@ %locale/@AB_CD@/global/
   locale/@AB_CD@/global/about.dtd                       (%chrome/global/about.dtd)
   locale/@AB_CD@/global/aboutAbout.dtd                  (%chrome/global/aboutAbout.dtd)
   locale/@AB_CD@/global/aboutRights.dtd                 (%chrome/global/aboutRights.dtd)
   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)
 + locale/@AB_CD@/global/browser.properties              (%chrome/global/browser.properties)
 + locale/@AB_CD@/global/charsetOverlay.dtd              (%chrome/global/charsetOverlay.dtd)
 + locale/@AB_CD@/global/commonDialog.dtd                (%chrome/global/commonDialog.dtd)
 + locale/@AB_CD@/global/commonDialogs.properties        (%chrome/global/commonDialogs.properties)
 + locale/@AB_CD@/global/config.dtd                      (%chrome/global/config.dtd)