Bug 937253 - Remove old unused WebApp code paths r=wesj
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -137,17 +137,16 @@ public abstract class GeckoApp
}
public static final String ACTION_ALERT_CALLBACK = "org.mozilla.gecko.ACTION_ALERT_CALLBACK";
public static final String ACTION_HOMESCREEN_SHORTCUT = "org.mozilla.gecko.BOOKMARK";
public static final String ACTION_DEBUG = "org.mozilla.gecko.DEBUG";
public static final String ACTION_LAUNCH_SETTINGS = "org.mozilla.gecko.SETTINGS";
public static final String ACTION_LOAD = "org.mozilla.gecko.LOAD";
public static final String ACTION_INIT_PW = "org.mozilla.gecko.INIT_PW";
- public static final String ACTION_WEBAPP_PREFIX = "org.mozilla.gecko.WEBAPP";
public static final String EXTRA_STATE_BUNDLE = "stateBundle";
public static final String PREFS_ALLOW_STATE_BUNDLE = "allowStateBundle";
public static final String PREFS_OOM_EXCEPTION = "OOMException";
public static final String PREFS_VERSION_CODE = "versionCode";
public static final String PREFS_WAS_STOPPED = "wasStopped";
public static final String PREFS_CRASHED = "crashed";
@@ -1844,22 +1843,16 @@ public abstract class GeckoApp
if (ACTION_LOAD.equals(action)) {
String uri = intent.getDataString();
Tabs.getInstance().loadUrl(uri);
} else if (Intent.ACTION_VIEW.equals(action)) {
String uri = intent.getDataString();
Tabs.getInstance().loadUrl(uri, Tabs.LOADURL_NEW_TAB |
Tabs.LOADURL_USER_ENTERED |
Tabs.LOADURL_EXTERNAL);
- } else if (action != null && action.startsWith(ACTION_WEBAPP_PREFIX)) {
- // A lightweight mechanism for loading a web page as a webapp
- // without installing the app natively nor registering it in the DOM
- // application registry.
- String uri = getURIFromIntent(intent);
- GeckoAppShell.sendEventToGecko(GeckoEvent.createWebappLoadEvent(uri));
} else if (ACTION_HOMESCREEN_SHORTCUT.equals(action)) {
String uri = getURIFromIntent(intent);
GeckoAppShell.sendEventToGecko(GeckoEvent.createBookmarkLoadEvent(uri));
} else if (Intent.ACTION_SEARCH.equals(action)) {
String uri = getURIFromIntent(intent);
GeckoAppShell.sendEventToGecko(GeckoEvent.createURILoadEvent(uri));
} else if (ACTION_ALERT_CALLBACK.equals(action)) {
processAlertCallback(intent);
--- a/mobile/android/base/GeckoEvent.java
+++ b/mobile/android/base/GeckoEvent.java
@@ -714,23 +714,16 @@ public class GeckoEvent {
public static GeckoEvent createURILoadEvent(String uri) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
event.mCharacters = uri;
event.mCharactersExtra = "";
return event;
}
- public static GeckoEvent createWebappLoadEvent(String uri) {
- GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
- event.mCharacters = uri;
- event.mCharactersExtra = "-webapp";
- return event;
- }
-
public static GeckoEvent createBookmarkLoadEvent(String uri) {
GeckoEvent event = GeckoEvent.get(NativeGeckoEvent.LOAD_URI);
event.mCharacters = uri;
event.mCharactersExtra = "-bookmark";
return event;
}
public static GeckoEvent createVisitedEvent(String data) {
--- a/mobile/android/base/GeckoThread.java
+++ b/mobile/android/base/GeckoThread.java
@@ -115,19 +115,16 @@ public class GeckoThread extends Thread
GeckoLoader.loadNSSLibs(context, resourcePath);
GeckoLoader.loadGeckoLibs(context, resourcePath);
GeckoJavaSampler.setLibsLoaded();
return resourcePath;
}
private String getTypeFromAction(String action) {
- if (action != null && action.startsWith(GeckoApp.ACTION_WEBAPP_PREFIX)) {
- return "-webapp";
- }
if (GeckoApp.ACTION_HOMESCREEN_SHORTCUT.equals(action)) {
return "-bookmark";
}
return null;
}
private String addCustomProfileArg(String args) {
String profileArg = "";
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -473,56 +473,50 @@ var BrowserApp = {
// TODO: replace with Android implementation of WebappOSUtils.isLaunchable.
Cu.import("resource://gre/modules/Webapps.jsm");
DOMApplicationRegistry.allAppsLaunchable = true;
RemoteDebugger.init();
UserAgentOverrides.init();
DesktopUserAgent.init();
Distribution.init();
Tabs.init();
+ SearchEngines.init();
#ifdef ACCESSIBILITY
AccessFu.attach(window);
#endif
#ifdef NIGHTLY_BUILD
ShumwayUtils.init();
#endif
let url = null;
- let pinned = false;
if ("arguments" in window) {
if (window.arguments[0])
url = window.arguments[0];
if (window.arguments[1])
gScreenWidth = window.arguments[1];
if (window.arguments[2])
gScreenHeight = window.arguments[2];
- if (window.arguments[3])
- pinned = window.arguments[3];
- }
-
- if (pinned) {
- this._initRuntime(this._startupStatus, url, aUrl => this.addTab(aUrl));
- } else {
- SearchEngines.init();
- this.initContextMenu();
- }
+ }
+
// The order that context menu items are added is important
// Make sure the "Open in App" context menu item appears at the bottom of the list
+ this.initContextMenu();
ExternalApps.init();
// XXX maybe we don't do this if the launch was kicked off from external
Services.io.offline = false;
// Broadcast a UIReady message so add-ons know we are finished with startup
let event = document.createEvent("Events");
event.initEvent("UIReady", true, false);
window.dispatchEvent(event);
- if (this._startupStatus)
+ if (this._startupStatus) {
this.onAppUpdated();
+ }
if (!ParentalControls.isAllowed(ParentalControls.INSTALL_EXTENSION)) {
// Disable extension installs
Services.prefs.setIntPref("extensions.enabledScopes", 1);
Services.prefs.setIntPref("extensions.autoDisableScopes", 1);
Services.prefs.setBoolPref("xpinstall.enabled", false);
}
@@ -1098,17 +1092,18 @@ var BrowserApp = {
let message = {
type: "Tab:Close",
tabID: aTab.id
};
Messaging.sendRequest(message);
},
_loadWebapp: function(aMessage) {
-
+ // Entry point for WebApps. This is the point in which we know
+ // the code is being used as a WebApp runtime.
this._initRuntime(this._startupStatus, aMessage.url, aUrl => {
this.manifestUrl = aMessage.url;
this.addTab(aUrl, { title: aMessage.name });
});
},
// Calling this will update the state in BrowserApp after a tab has been
// closed in the Java UI.