| Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| index de62b51d0efcdc9cc837c42d7f750371246342eb..c443edd0f44f0453d0c1f54e811e5c057c42501e 100644
|
| --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
|
| @@ -12,7 +12,6 @@ import android.app.assist.AssistStructure.ViewNode;
|
| import android.content.ClipboardManager;
|
| import android.content.ContentResolver;
|
| import android.content.Context;
|
| -import android.content.ContextWrapper;
|
| import android.content.Intent;
|
| import android.content.pm.PackageManager;
|
| import android.content.res.Configuration;
|
| @@ -433,22 +432,6 @@ public class ContentViewCore implements AccessibilityStateChangeListener, Screen
|
| public void onSmartClipDataExtracted(String text, String html, Rect clipRect);
|
| }
|
|
|
| - /**
|
| - * Cast from Context to Activity taking ContextWrapper into account.
|
| - */
|
| - public static Activity activityFromContext(Context context) {
|
| - // Only retrieve the base context if the supplied context is a ContextWrapper but not
|
| - // an Activity, given that Activity is already a subclass of ContextWrapper.
|
| - if (context instanceof Activity) {
|
| - return ((Activity) context);
|
| - } else if (context instanceof ContextWrapper) {
|
| - context = ((ContextWrapper) context).getBaseContext();
|
| - return activityFromContext(context);
|
| - } else {
|
| - return null;
|
| - }
|
| - }
|
| -
|
| private final Context mContext;
|
| private ViewGroup mContainerView;
|
| private InternalAccessDelegate mContainerViewInternals;
|
|
|