Backed out changeset 189c2c75a5ae (bug 1534802) for causing TL bustages

mobile/android/base/java/org/mozilla/gecko/GeckoApp.java

@@ -909,6 +909,18 @@ public abstract class GeckoApp extends GeckoActivity
         return inSampleSize;
     }
 
+    @Override // GeckoSession.ContentDelegate
+    public void onTitleChange(final GeckoSession session, final String title) {
+    }
+
+    @Override // GeckoSession.ContentDelegate
+    public void onFocusRequest(final GeckoSession session) {
+    }
+
+    @Override // GeckoSession.ContentDelegate
+    public void onCloseRequest(final GeckoSession session) {
+    }
+
     @Override // GeckoSession.ContentDelegate
     public void onFullScreen(final GeckoSession session, final boolean fullScreen) {
         if (fullScreen) {
@@ -920,6 +932,26 @@ public abstract class GeckoApp extends GeckoActivity
         ActivityUtils.setFullScreen(this, fullScreen);
     }
 
+    @Override
+    public void onContextMenu(final GeckoSession session,
+                              final int screenX, final int screenY,
+                              final GeckoSession.ContentDelegate.ContextElement element) {
+    }
+
+    @Override
+    public void onExternalResponse(final GeckoSession session, final GeckoSession.WebResponseInfo request) {
+        // Won't happen, as we don't use the GeckoView download support in Fennec
+    }
+
+    @Override
+    public void onCrash(final GeckoSession session) {
+        // Won't happen, as we don't use e10s in Fennec
+    }
+
+    @Override
+    public void onFirstComposite(final GeckoSession session) {
+    }
+
     protected void setFullScreen(final boolean fullscreen) {
         ThreadUtils.postToUiThread(new Runnable() {
             @Override

mobile/android/base/java/org/mozilla/gecko/customtabs/CustomTabsActivity.java

@@ -630,6 +630,12 @@ public class CustomTabsActivity extends AppCompatActivity
         throw new IllegalStateException("Unexpected new session");
     }
 
+    @Override
+    public GeckoResult<String> onLoadError(final GeckoSession session, final String urlStr,
+                                           final WebRequestError error) {
+        return null;
+    }
+
     /* GeckoSession.ProgressDelegate */
     @Override
     public void onPageStart(GeckoSession session, String url) {
@@ -674,6 +680,11 @@ public class CustomTabsActivity extends AppCompatActivity
         startActivity(intent);
     }
 
+    @Override
+    public void onCloseRequest(GeckoSession session) {
+        // Ignore
+    }
+
     @Override
     public void onFullScreen(GeckoSession session, boolean fullScreen) {
         ActivityUtils.setFullScreen(this, fullScreen);
@@ -704,6 +715,20 @@ public class CustomTabsActivity extends AppCompatActivity
         });
     }
 
+    @Override
+    public void onExternalResponse(final GeckoSession session, final GeckoSession.WebResponseInfo request) {
+        // Won't happen, as we don't use the GeckoView download support in Fennec
+    }
+
+    @Override
+    public void onCrash(final GeckoSession session) {
+        // Won't happen, as we don't use e10s in Fennec
+    }
+
+    @Override
+    public void onFirstComposite(final GeckoSession session) {
+    }
+
     @Override // ActionModePresenter
     public void startActionMode(final ActionMode.Callback callback) {
         endActionMode();

mobile/android/base/java/org/mozilla/gecko/webapps/WebAppActivity.java

@@ -323,11 +323,23 @@ public class WebAppActivity extends AppCompatActivity
         mGeckoSession.getSettings().setDisplayMode(mode);
     }
 
+    @Override // GeckoSession.NavigationDelegate
+    public void onLocationChange(GeckoSession session, String url) {
+    }
+
     @Override // GeckoSession.NavigationDelegate
     public void onCanGoBack(GeckoSession session, boolean canGoBack) {
         mCanGoBack = canGoBack;
     }
 
+    @Override // GeckoSession.NavigationDelegate
+    public void onCanGoForward(GeckoSession session, boolean canGoForward) {
+    }
+
+    @Override // GeckoSession.ContentDelegate
+    public void onTitleChange(GeckoSession session, String title) {
+    }
+
     @Override // GeckoSession.ContentDelegate
     public void onFocusRequest(GeckoSession session) {
         Intent intent = new Intent(getIntent());
@@ -335,6 +347,11 @@ public class WebAppActivity extends AppCompatActivity
         startActivity(intent);
     }
 
+    @Override // GeckoSession.ContentDelegate
+    public void onCloseRequest(GeckoSession session) {
+        // Ignore
+    }
+
     @Override // GeckoSession.ContentDelegate
     public void onContextMenu(final GeckoSession session,
                               int screenX, int screenY,
@@ -350,6 +367,20 @@ public class WebAppActivity extends AppCompatActivity
         WebApps.openInFennec(validUri, WebAppActivity.this);
     }
 
+    @Override // GeckoSession.ContentDelegate
+    public void onExternalResponse(final GeckoSession session, final GeckoSession.WebResponseInfo request) {
+        // Won't happen, as we don't use the GeckoView download support in Fennec
+    }
+
+    @Override // GeckoSession.ContentDelegate
+    public void onCrash(final GeckoSession session) {
+        // Won't happen, as we don't use e10s in Fennec
+    }
+
+    @Override
+    public void onFirstComposite(final GeckoSession session) {
+    }
+
     @Override // GeckoSession.ContentDelegate
     public void onFullScreen(GeckoSession session, boolean fullScreen) {
         updateFullScreenContent(fullScreen);