Bug 735557 - Add about:preferences to the inContentWhitelist. r=bmcbride
authorJon Rietveld <jon.rietveld@gmail.com>
Tue, 08 May 2012 19:11:43 -0700
changeset 93572 b2d23fc61c6f0d6f5e41ba796518eb29ab720c7e
parent 93571 f1148c7cd5e39816e31fe8ed6620aebce05d0075
child 93573 4d02fc5fc5c3e97bafbf034b9b6e77eef8f9d060
push id9210
push userjwein@mozilla.com
push dateWed, 09 May 2012 05:35:43 +0000
treeherdermozilla-inbound@8b195889f55c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbmcbride
bugs735557
milestone15.0a1
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
Bug 735557 - Add about:preferences to the inContentWhitelist. r=bmcbride
browser/base/content/browser.js
browser/base/content/test/browser_disablechrome.js
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -4511,17 +4511,18 @@ var XULBrowserWindow = {
   status: "",
   defaultStatus: "",
   jsStatus: "",
   jsDefaultStatus: "",
   overLink: "",
   startTime: 0,
   statusText: "",
   isBusy: false,
-  inContentWhitelist: ["about:addons", "about:permissions", "about:sync-progress"],
+  inContentWhitelist: ["about:addons", "about:permissions", 
+                       "about:sync-progress", "about:preferences"],
 
   QueryInterface: function (aIID) {
     if (aIID.equals(Ci.nsIWebProgressListener) ||
         aIID.equals(Ci.nsIWebProgressListener2) ||
         aIID.equals(Ci.nsISupportsWeakReference) ||
         aIID.equals(Ci.nsIXULBrowserWindow) ||
         aIID.equals(Ci.nsISupports))
       return this;
--- a/browser/base/content/test/browser_disablechrome.js
+++ b/browser/base/content/test/browser_disablechrome.js
@@ -182,10 +182,35 @@ function run_chrome_about_test_3() {
 
 function run_http_test4() {
   info("HTTP tests");
   test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_4);
 }
 
 function run_chrome_about_test_4() {
   info("Chrome about: tests");
-  test_url("about:Addons", true, end_test);
+  test_url("about:Addons", true, run_http_test5);
+ }
+
+function run_http_test5() {
+  info("HTTP tests");
+  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_5);
 }
+
+// Should hide the chrome
+function run_chrome_about_test_5() {
+  info("Chrome about: tests");
+  test_url("about:preferences", true, function(){
+    info("Tabs on bottom");
+    TabsOnTop.enabled = false;
+    run_http_test6();
+  });
+}
+
+function run_http_test6() {
+  info("HTTP tests");
+  test_url(HTTPSRC + "disablechrome.html", false, run_chrome_about_test_6);
+}
+
+function run_chrome_about_test_6() {
+  info("Chrome about: tests");
+  test_url("about:preferences", true, end_test);
+}
\ No newline at end of file