Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java

Issue 2847523002: Android: Remove GetApplicationContext part 4 (Closed)
Patch Set: Rebase and fix build Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/android/view_configuration.cc ('k') | ui/platform_window/android/platform_window_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java
diff --git a/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java b/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java
index 91c7328d90fcb89a0eb6cf0100aab40eb8b47f1b..26810fff1d75253037ffe5e32f164c325d61fb2b 100644
--- a/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java
+++ b/ui/platform_window/android/java/src/org/chromium/ui/PlatformWindowAndroid.java
@@ -5,7 +5,6 @@
package org.chromium.ui;
import android.app.Activity;
-import android.content.Context;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.Surface;
@@ -15,6 +14,7 @@ import android.view.View;
import android.view.inputmethod.EditorInfo;
import android.view.inputmethod.InputConnection;
+import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.JNINamespace;
@@ -30,15 +30,14 @@ public class PlatformWindowAndroid extends SurfaceView {
@CalledByNative
public static PlatformWindowAndroid createForActivity(
- Activity activity, long nativeViewport, long nativeImeController) {
- PlatformWindowAndroid rv =
- new PlatformWindowAndroid(activity, nativeViewport, nativeImeController);
- activity.setContentView(rv);
+ long nativeViewport, long nativeImeController) {
+ PlatformWindowAndroid rv = new PlatformWindowAndroid(nativeViewport, nativeImeController);
+ ((Activity) ContextUtils.getApplicationContext()).setContentView(rv);
return rv;
}
- public PlatformWindowAndroid(Context context, long nativeViewport, long nativeImeController) {
- super(context);
+ private PlatformWindowAndroid(long nativeViewport, long nativeImeController) {
+ super(ContextUtils.getApplicationContext());
setFocusable(true);
setFocusableInTouchMode(true);
@@ -46,7 +45,8 @@ public class PlatformWindowAndroid extends SurfaceView {
mNativeMojoViewport = nativeViewport;
assert mNativeMojoViewport != 0;
- final float density = context.getResources().getDisplayMetrics().density;
+ final float density =
+ ContextUtils.getApplicationContext().getResources().getDisplayMetrics().density;
mSurfaceCallback = new SurfaceHolder.Callback() {
@Override
« no previous file with comments | « ui/gfx/android/view_configuration.cc ('k') | ui/platform_window/android/platform_window_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698