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

Unified Diff: ui/platform_window/android/platform_window_android.cc

Issue 2431753002: Mus experiment in content shell on Android.
Patch Set: Fix mac bot Created 4 years, 1 month 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/platform_window/android/platform_window_android.h ('k') | ui/platform_window/platform_window.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/platform_window/android/platform_window_android.cc
diff --git a/ui/platform_window/android/platform_window_android.cc b/ui/platform_window/android/platform_window_android.cc
index a4618aa8b3f97aabb2238f62e4e27cf17f817c6b..925a74983a2d656475960af6a1b7f91e2b357f8e 100644
--- a/ui/platform_window/android/platform_window_android.cc
+++ b/ui/platform_window/android/platform_window_android.cc
@@ -58,8 +58,7 @@ bool PlatformWindowAndroid::Register(JNIEnv* env) {
PlatformWindowAndroid::PlatformWindowAndroid(PlatformWindowDelegate* delegate)
: delegate_(delegate),
window_(NULL),
- id_generator_(0),
- weak_factory_(this) {
+ id_generator_(0) {
}
PlatformWindowAndroid::~PlatformWindowAndroid() {
@@ -164,8 +163,8 @@ void PlatformWindowAndroid::Show() {
return;
JNIEnv* env = base::android::AttachCurrentThread();
java_platform_window_android_ = JavaObjectWeakGlobalRef(
- env, Java_PlatformWindowAndroid_createForActivity(
- env, base::android::GetApplicationContext(),
+ env, Java_PlatformWindowAndroid_createForCurrentActivity(
+ env,
reinterpret_cast<jlong>(this),
reinterpret_cast<jlong>(&platform_ime_controller_)).obj());
}
« no previous file with comments | « ui/platform_window/android/platform_window_android.h ('k') | ui/platform_window/platform_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698