Bug 972485 - [Australis] Replace aboutCustomizing.xhtml with aboutCustomizing.xul to avoid some sync IO on load. r=Gijs, a=sledru.
authorMike Conley <mconley@mozilla.com>
Thu, 13 Feb 2014 12:50:00 -0500
changeset 182919 69da855f60a7d1b0948cb56c8522ccb527828575
parent 182918 e3626652c8b01910f734d97a7d841db433fa1131
child 182920 81965a501118db3f9bb7c099597fed00b985f4c5
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, sledru
bugs972485
milestone29.0a2
Bug 972485 - [Australis] Replace aboutCustomizing.xhtml with aboutCustomizing.xul to avoid some sync IO on load. r=Gijs, a=sledru.
browser/components/about/AboutRedirector.cpp
browser/components/customizableui/content/aboutCustomizing.xhtml
browser/components/customizableui/content/aboutCustomizing.xul
browser/components/customizableui/content/jar.mn
--- a/browser/components/about/AboutRedirector.cpp
+++ b/browser/components/about/AboutRedirector.cpp
@@ -90,17 +90,17 @@ static RedirEntry kRedirMap[] = {
 #ifdef MOZ_SERVICES_HEALTHREPORT
   { "healthreport", "chrome://browser/content/abouthealthreport/abouthealth.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
 #endif
   { "accounts", "chrome://browser/content/aboutaccounts/aboutaccounts.xhtml",
     nsIAboutModule::ALLOW_SCRIPT },
   { "app-manager", "chrome://browser/content/devtools/app-manager/index.xul",
     nsIAboutModule::ALLOW_SCRIPT },
-  { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xhtml",
+  { "customizing", "chrome://browser/content/customizableui/aboutCustomizing.xul",
     nsIAboutModule::ALLOW_SCRIPT },
 };
 static const int kRedirTotal = ArrayLength(kRedirMap);
 
 static nsAutoCString
 GetAboutModuleName(nsIURI *aURI)
 {
   nsAutoCString path;
deleted file mode 100644
--- a/browser/components/customizableui/content/aboutCustomizing.xhtml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html [
-  <!ENTITY % htmlDTD
-    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "DTD/xhtml1-strict.dtd">
-  %htmlDTD;
-  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-  %brandDTD;
-  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
-  %browserDTD;
-]>
-
-<html xmlns="http://www.w3.org/1999/xhtml"
-      disablefastfind="true">
-	<head>
-		<title>&customizeMode.tabTitle;</title>
-		<link rel="icon" type="image/x-icon"
-		      href="chrome://browser/skin/customizableui/customizeFavicon.ico"/>
-	</head>
-	<body></body>
-</html>
new file mode 100644
--- /dev/null
+++ b/browser/components/customizableui/content/aboutCustomizing.xul
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+<!DOCTYPE window [
+  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+  <!ENTITY % browserDTD SYSTEM "chrome://browser/locale/browser.dtd">
+  %browserDTD;
+]>
+
+<window id="aboutCustomizingWindow"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        xmlns:html="http://www.w3.org/1999/xhtml"
+        title="&customizeMode.tabTitle;">
+  <html:head>
+    <html:link rel="icon" type="image/x-icon"
+               href="chrome://browser/skin/customizableui/customizeFavicon.ico"/>
+  </html:head>
+</window>
--- a/browser/components/customizableui/content/jar.mn
+++ b/browser/components/customizableui/content/jar.mn
@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
-  content/browser/customizableui/aboutCustomizing.xhtml
+  content/browser/customizableui/aboutCustomizing.xul
   content/browser/customizableui/panelUI.css
 * content/browser/customizableui/panelUI.js
   content/browser/customizableui/panelUI.xml
   content/browser/customizableui/toolbar.xml