Bug 840574 - Add applicationId to tabs; use it to open new urls in the correct tabs. r=margaret

Note that I'm not actually sure where delayLoad and selected are used by
Gecko and thus the side effects of changing them (but I did set the flags
as I'd expect for them to work).

mobile/android/base/webapp/WebappImpl.java

@@ -185,11 +185,19 @@ public class WebappImpl extends GeckoApp implements InstallCallback {
     }
 
     @Override
-    protected void loadStartupTab(String uri, int flags) {
+    protected void loadStartupTabWithAboutHome(final int flags) {
+        loadStartupTabWithExternalUrl(null, null, flags);
+    }
+
+    // Note: there is no support for applicationId in Webapps at
+    // the moment because I don't have time to debug/test.
+    @Override
+    protected void loadStartupTabWithExternalUrl(final String uri, final String applicationId,
+            int flags) {
         // Load a tab so it's available for any code that assumes a tab
         // before the app tab itself is loaded in BrowserApp._loadWebapp.
         flags = Tabs.LOADURL_NEW_TAB | Tabs.LOADURL_USER_ENTERED | Tabs.LOADURL_EXTERNAL;
-        super.loadStartupTab("about:blank", flags);
+        super.loadStartupTabWithExternalUrl("about:blank", null, flags);
     }
 
     private void showSplash() {