Index: ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java |
diff --git a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java |
index 399381583bbfd96655ef25c45b56f985e565041d..615b0ab7eee34dd224477a541a376f51ff3d8632 100644 |
--- a/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java |
+++ b/ui/android/java/src/org/chromium/ui/base/ActivityWindowAndroid.java |
@@ -7,7 +7,6 @@ |
import android.app.Activity; |
import android.app.PendingIntent; |
import android.content.ActivityNotFoundException; |
-import android.content.Context; |
import android.content.Intent; |
import android.content.IntentSender.SendIntentException; |
import android.content.SharedPreferences; |
@@ -53,8 +52,8 @@ |
* indicate their activity state listening preference. |
* @param activity The activity associated with the WindowAndroid. |
*/ |
- public ActivityWindowAndroid(Context context) { |
- this(context, true); |
+ public ActivityWindowAndroid(Activity activity) { |
+ this(activity, true); |
} |
/** |
@@ -62,12 +61,8 @@ |
* @param activity The activity associated with the WindowAndroid. |
* @param listenToActivityState Whether to listen to activity state changes. |
*/ |
- public ActivityWindowAndroid(Context context, boolean listenToActivityState) { |
- super(context); |
- Activity activity = activityFromContext(context); |
- if (activity == null) { |
- throw new IllegalArgumentException("Context is not and does not wrap an Activity"); |
- } |
+ public ActivityWindowAndroid(Activity activity, boolean listenToActivityState) { |
+ super(activity); |
mHandler = new Handler(); |
mOutstandingPermissionRequests = new SparseArray<PermissionCallback>(); |
if (listenToActivityState) { |
@@ -212,7 +207,7 @@ |
@Override |
public WeakReference<Activity> getActivity() { |
- return new WeakReference<Activity>(activityFromContext(getContext().get())); |
+ return new WeakReference<Activity>((Activity) getContext().get()); |
} |
@Override |