From 8b90d9d66ed2bc674d2416dd19b4fca429f96d27 Mon Sep 17 00:00:00 2001 From: Kershaw Chang Date: Tue, 27 May 2014 18:01:01 +0800 Subject: [PATCH] Bug 1013094 - Rename browser.manifestURL and browser.homescreenURL, r=fabrice --- b2g/chrome/content/shell.js | 4 ++-- dom/ipc/ContentParent.cpp | 2 +- layout/tools/reftest/b2g_desktop.py | 4 ++-- layout/tools/reftest/reftest.js | 2 +- layout/tools/reftest/runreftestb2g.py | 4 ++-- testing/profiles/prefs_b2g_unittest.js | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/chrome/content/shell.js b/b2g/chrome/content/shell.js index 874b5cbea89..a9bb1de1862 100644 --- a/b2g/chrome/content/shell.js +++ b/b2g/chrome/content/shell.js @@ -221,11 +221,11 @@ var shell = { return homeSrc; } catch (e) {} - return Services.prefs.getCharPref('browser.homescreenURL'); + return Services.prefs.getCharPref('b2g.system_startup_url'); }, get manifestURL() { - return Services.prefs.getCharPref('browser.manifestURL'); + return Services.prefs.getCharPref('b2g.system_manifest_url'); }, _started: false, diff --git a/dom/ipc/ContentParent.cpp b/dom/ipc/ContentParent.cpp index 5885f8a81f5..6de82859766 100644 --- a/dom/ipc/ContentParent.cpp +++ b/dom/ipc/ContentParent.cpp @@ -826,7 +826,7 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext, aFrameElement->GetAttr(kNameSpaceID_None, nsGkAtoms::parentapp, parentAppManifestURL); nsAdoptingString systemAppManifestURL = - Preferences::GetString("browser.manifestURL"); + Preferences::GetString("b2g.system_manifest_url"); nsCOMPtr appsService = do_GetService(APPS_SERVICE_CONTRACTID); if (!parentAppManifestURL.IsEmpty() && diff --git a/layout/tools/reftest/b2g_desktop.py b/layout/tools/reftest/b2g_desktop.py index e390a814e45..8eb376e25c5 100644 --- a/layout/tools/reftest/b2g_desktop.py +++ b/layout/tools/reftest/b2g_desktop.py @@ -105,8 +105,8 @@ class B2GDesktopReftest(RefTest): prefs = {} # Turn off the locale picker screen prefs["browser.firstrun.show.localepicker"] = False - prefs["browser.homescreenURL"] = "app://test-container.gaiamobile.org/index.html" - prefs["browser.manifestURL"] = "app://test-container.gaiamobile.org/manifest.webapp" + prefs["b2g.system_startup_url"] = "app://test-container.gaiamobile.org/index.html" + prefs["b2g.system_manifest_url"] = "app://test-container.gaiamobile.org/manifest.webapp" prefs["browser.tabs.remote"] = False prefs["dom.ipc.tabs.disabled"] = False prefs["dom.mozBrowserFramesEnabled"] = True diff --git a/layout/tools/reftest/reftest.js b/layout/tools/reftest/reftest.js index 9734b9a5b73..d45369ea8c7 100644 --- a/layout/tools/reftest/reftest.js +++ b/layout/tools/reftest/reftest.js @@ -261,7 +261,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win) if (gBrowserIsIframe) { gBrowser = gContainingWindow.document.createElementNS(XHTML_NS, "iframe"); gBrowser.setAttribute("mozbrowser", ""); - gBrowser.setAttribute("mozapp", prefs.getCharPref("browser.manifestURL")); + gBrowser.setAttribute("mozapp", prefs.getCharPref("b2g.system_manifest_url")); } else { gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser"); } diff --git a/layout/tools/reftest/runreftestb2g.py b/layout/tools/reftest/runreftestb2g.py index 7cf63c6e225..dbc7ff55aad 100644 --- a/layout/tools/reftest/runreftestb2g.py +++ b/layout/tools/reftest/runreftestb2g.py @@ -423,8 +423,8 @@ class B2GRemoteReftest(RefTest): # Turn off the locale picker screen prefs["browser.firstrun.show.localepicker"] = False - prefs["browser.homescreenURL"] = "app://test-container.gaiamobile.org/index.html" - prefs["browser.manifestURL"] = "app://test-container.gaiamobile.org/manifest.webapp" + prefs["b2g.system_startup_url"] = "app://test-container.gaiamobile.org/index.html" + prefs["b2g.system_manifest_url"] = "app://test-container.gaiamobile.org/manifest.webapp" prefs["browser.tabs.remote"] = False prefs["dom.ipc.tabs.disabled"] = False prefs["dom.mozBrowserFramesEnabled"] = True diff --git a/testing/profiles/prefs_b2g_unittest.js b/testing/profiles/prefs_b2g_unittest.js index e854bbf7f82..ac5e9ccba10 100644 --- a/testing/profiles/prefs_b2g_unittest.js +++ b/testing/profiles/prefs_b2g_unittest.js @@ -1,7 +1,7 @@ // Prefs specific to b2g mochitests -user_pref("browser.homescreenURL","app://test-container.gaiamobile.org/index.html"); -user_pref("browser.manifestURL","app://test-container.gaiamobile.org/manifest.webapp"); +user_pref("b2g.system_startup_url","app://test-container.gaiamobile.org/index.html"); +user_pref("b2g.system_manifest_url","app://test-container.gaiamobile.org/manifest.webapp"); user_pref("dom.mozBrowserFramesEnabled", "%(OOP)s"); user_pref("dom.ipc.tabs.disabled", false); user_pref("dom.ipc.browser_frames.oop_by_default", false);