wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1013094 - Rename browser.manifestURL and browser.homescreenURL, r=fabrice

Browse Source
This commit is contained in:
Kershaw Chang 2014-05-27 18:01:01 +08:00
parent c670e13024
commit 8b90d9d66e
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
b2g/chrome/content/shell.js
View File

@ -221,11 +221,11 @@ var shell = {
return homeSrc; return homeSrc;
} catch (e) {} } catch (e) {}
return Services.prefs.getCharPref('browser.homescreenURL'); return Services.prefs.getCharPref('b2g.system_startup_url');
}, },
get manifestURL() { get manifestURL() {
return Services.prefs.getCharPref('browser.manifestURL'); return Services.prefs.getCharPref('b2g.system_manifest_url');
}, },
_started: false, _started: false,

2
dom/ipc/ContentParent.cpp
View File

@ -826,7 +826,7 @@ ContentParent::CreateBrowserOrApp(const TabContext& aContext,
aFrameElement->GetAttr(kNameSpaceID_None, aFrameElement->GetAttr(kNameSpaceID_None,
nsGkAtoms::parentapp, parentAppManifestURL); nsGkAtoms::parentapp, parentAppManifestURL);
nsAdoptingString systemAppManifestURL = nsAdoptingString systemAppManifestURL =
Preferences::GetString("browser.manifestURL"); Preferences::GetString("b2g.system_manifest_url");
nsCOMPtr<nsIAppsService> appsService = nsCOMPtr<nsIAppsService> appsService =
do_GetService(APPS_SERVICE_CONTRACTID); do_GetService(APPS_SERVICE_CONTRACTID);
if (!parentAppManifestURL.IsEmpty() && if (!parentAppManifestURL.IsEmpty() &&

4
layout/tools/reftest/b2g_desktop.py
View File

@ -105,8 +105,8 @@ class B2GDesktopReftest(RefTest):
prefs = {} prefs = {}
# Turn off the locale picker screen # Turn off the locale picker screen
prefs["browser.firstrun.show.localepicker"] = False prefs["browser.firstrun.show.localepicker"] = False
prefs["browser.homescreenURL"] = "app://test-container.gaiamobile.org/index.html" prefs["b2g.system_startup_url"] = "app://test-container.gaiamobile.org/index.html"
prefs["browser.manifestURL"] = "app://test-container.gaiamobile.org/manifest.webapp" prefs["b2g.system_manifest_url"] = "app://test-container.gaiamobile.org/manifest.webapp"
prefs["browser.tabs.remote"] = False prefs["browser.tabs.remote"] = False
prefs["dom.ipc.tabs.disabled"] = False prefs["dom.ipc.tabs.disabled"] = False
prefs["dom.mozBrowserFramesEnabled"] = True prefs["dom.mozBrowserFramesEnabled"] = True

2
layout/tools/reftest/reftest.js
View File

@ -261,7 +261,7 @@ this.OnRefTestLoad = function OnRefTestLoad(win)
if (gBrowserIsIframe) { if (gBrowserIsIframe) {
gBrowser = gContainingWindow.document.createElementNS(XHTML_NS, "iframe"); gBrowser = gContainingWindow.document.createElementNS(XHTML_NS, "iframe");
gBrowser.setAttribute("mozbrowser", ""); gBrowser.setAttribute("mozbrowser", "");
gBrowser.setAttribute("mozapp", prefs.getCharPref("browser.manifestURL")); gBrowser.setAttribute("mozapp", prefs.getCharPref("b2g.system_manifest_url"));
} else { } else {
gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser"); gBrowser = gContainingWindow.document.createElementNS(XUL_NS, "xul:browser");
} }

4
layout/tools/reftest/runreftestb2g.py
View File

@ -423,8 +423,8 @@ class B2GRemoteReftest(RefTest):
# Turn off the locale picker screen # Turn off the locale picker screen
prefs["browser.firstrun.show.localepicker"] = False prefs["browser.firstrun.show.localepicker"] = False
prefs["browser.homescreenURL"] = "app://test-container.gaiamobile.org/index.html" prefs["b2g.system_startup_url"] = "app://test-container.gaiamobile.org/index.html"
prefs["browser.manifestURL"] = "app://test-container.gaiamobile.org/manifest.webapp" prefs["b2g.system_manifest_url"] = "app://test-container.gaiamobile.org/manifest.webapp"
prefs["browser.tabs.remote"] = False prefs["browser.tabs.remote"] = False
prefs["dom.ipc.tabs.disabled"] = False prefs["dom.ipc.tabs.disabled"] = False
prefs["dom.mozBrowserFramesEnabled"] = True prefs["dom.mozBrowserFramesEnabled"] = True

4
testing/profiles/prefs_b2g_unittest.js
View File

@ -1,7 +1,7 @@
// Prefs specific to b2g mochitests // Prefs specific to b2g mochitests
user_pref("browser.homescreenURL","app://test-container.gaiamobile.org/index.html"); user_pref("b2g.system_startup_url","app://test-container.gaiamobile.org/index.html");
user_pref("browser.manifestURL","app://test-container.gaiamobile.org/manifest.webapp"); user_pref("b2g.system_manifest_url","app://test-container.gaiamobile.org/manifest.webapp");
user_pref("dom.mozBrowserFramesEnabled", "%(OOP)s"); user_pref("dom.mozBrowserFramesEnabled", "%(OOP)s");
user_pref("dom.ipc.tabs.disabled", false); user_pref("dom.ipc.tabs.disabled", false);
user_pref("dom.ipc.browser_frames.oop_by_default", false); user_pref("dom.ipc.browser_frames.oop_by_default", false);