From e3b1bc2e6800cf6ca755140a49f86d4c0af22dc5 Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Fri, 18 Mar 2016 16:46:39 -0700 Subject: [PATCH] Bug 1258450 - Remove unused GeckoInterface.getPromptService(). r=snorp MozReview-Commit-ID: 5Aq0TEVD1zD --HG-- extra : rebase_source : 2830b822e56ba46aa537367d7893badf2cf83c1d extra : histedit_source : f0cc93eab574a4243cd659969e37a8c2e5091e0c --- .../java/org/mozilla/gecko/BaseGeckoInterface.java | 6 ------ .../android/base/java/org/mozilla/gecko/GeckoApp.java | 5 ----- .../base/java/org/mozilla/gecko/GeckoAppShell.java | 11 ----------- 3 files changed, 22 deletions(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java b/mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java index c032ba94a6e1..e891d6b39238 100644 --- a/mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java +++ b/mobile/android/base/java/org/mozilla/gecko/BaseGeckoInterface.java @@ -44,12 +44,6 @@ public class BaseGeckoInterface implements GeckoAppShell.GeckoInterface { return mProfile; } - // Bug 908770: Implement this - @Override - public PromptService getPromptService() { - return null; - } - @Override public Activity getActivity() { return (Activity)mContext; diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java index 6af12b23f66b..046514187887 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoApp.java @@ -2303,11 +2303,6 @@ public abstract class GeckoApp } } - @Override - public PromptService getPromptService() { - return mPromptService; - } - @Override public void onBackPressed() { if (getSupportFragmentManager().getBackStackEntryCount() > 0) { diff --git a/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java b/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java index 56910f7724de..454736cc9169 100644 --- a/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java +++ b/mobile/android/base/java/org/mozilla/gecko/GeckoAppShell.java @@ -17,7 +17,6 @@ import java.io.PipedInputStream; import java.io.PipedOutputStream; import java.net.MalformedURLException; import java.net.Proxy; -import java.net.URI; import java.net.URISyntaxException; import java.net.URL; import java.net.URLConnection; @@ -28,7 +27,6 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.NoSuchElementException; import java.util.StringTokenizer; import java.util.TreeMap; import java.util.concurrent.ConcurrentHashMap; @@ -40,7 +38,6 @@ import org.mozilla.gecko.annotation.RobocopTarget; import org.mozilla.gecko.annotation.WrapForJNI; import org.mozilla.gecko.AppConstants.Versions; import org.mozilla.gecko.db.BrowserDB; -import org.mozilla.gecko.db.LocalURLMetadata; import org.mozilla.gecko.db.URLMetadataTable; import org.mozilla.gecko.favicons.Favicons; import org.mozilla.gecko.favicons.OnFaviconLoadedListener; @@ -50,7 +47,6 @@ import org.mozilla.gecko.gfx.PanZoomController; import org.mozilla.gecko.mozglue.ContextUtils; import org.mozilla.gecko.overlays.ui.ShareDialog; import org.mozilla.gecko.permissions.Permissions; -import org.mozilla.gecko.prompts.PromptService; import org.mozilla.gecko.util.EventCallback; import org.mozilla.gecko.util.GeckoRequest; import org.mozilla.gecko.util.HardwareCodecCapabilityUtils; @@ -92,7 +88,6 @@ import android.graphics.RectF; import android.graphics.SurfaceTexture; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.hardware.display.DisplayManager; import android.hardware.Sensor; import android.hardware.SensorEventListener; import android.hardware.SensorManager; @@ -103,12 +98,9 @@ import android.location.LocationManager; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.Environment; -import android.os.Handler; import android.os.Looper; -import android.os.MessageQueue; import android.os.SystemClock; import android.os.Vibrator; import android.provider.Browser; @@ -132,12 +124,10 @@ import android.view.inputmethod.InputMethodManager; import android.webkit.MimeTypeMap; import android.webkit.URLUtil; import android.widget.AbsoluteLayout; -import android.widget.Toast; public class GeckoAppShell { private static final String LOGTAG = "GeckoAppShell"; - private static final boolean LOGGING = false; // We have static members only. private GeckoAppShell() { } @@ -2200,7 +2190,6 @@ public class GeckoAppShell public interface GeckoInterface { public GeckoProfile getProfile(); - public PromptService getPromptService(); public Activity getActivity(); public String getDefaultUAString(); public LocationListener getLocationListener();