bug 957057 - refactor import in browser.js to make code easier to understand; r=wesj

--HG--
extra : rebase_source : 4014c863adc713de80975cafef81cdae00f5d09d
This commit is contained in:
Martyn Haigh 2014-01-24 21:12:08 -08:00
parent 143d52de94
commit 18b5f2e31d
3 changed files with 4 additions and 4 deletions

View File

@ -11,6 +11,9 @@ Cu.import("resource://gre/modules/NetUtil.jsm");
Cu.import("resource://gre/modules/PermissionsInstaller.jsm");
Cu.import("resource://gre/modules/PermissionPromptHelper.jsm");
Cu.import("resource://gre/modules/ContactService.jsm");
#ifdef MOZ_ANDROID_SYNTHAPKS
Cu.import("resource://gre/modules/AppsUtils.jsm");
#endif
function pref(name, value) {
return {

View File

@ -381,9 +381,6 @@ var BrowserApp = {
// TODO: replace with Android implementation of WebappOSUtils.isLaunchable.
Cu.import("resource://gre/modules/Webapps.jsm");
DOMApplicationRegistry.allAppsLaunchable = true;
// TODO: figure out why this is needed here.
Cu.import("resource://gre/modules/AppsUtils.jsm");
#else
WebappsUI.init();
#endif

View File

@ -40,7 +40,7 @@ chrome.jar:
content/SelectHelper.js (content/SelectHelper.js)
content/SelectionHandler.js (content/SelectionHandler.js)
content/dbg-browser-actors.js (content/dbg-browser-actors.js)
content/WebAppRT.js (content/WebAppRT.js)
* content/WebAppRT.js (content/WebAppRT.js)
content/InputWidgetHelper.js (content/InputWidgetHelper.js)
content/WebrtcUI.js (content/WebrtcUI.js)
content/MemoryObserver.js (content/MemoryObserver.js)