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

Unified Diff: blimp/client/core/contents/android/blimp_contents_impl_android.cc

Issue 2270323004: Add BlimpView to a Chrome tab when Blimp is enabled. (Closed)
Patch Set: Magic now happens Created 4 years, 4 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
Index: blimp/client/core/contents/android/blimp_contents_impl_android.cc
diff --git a/blimp/client/core/contents/android/blimp_contents_impl_android.cc b/blimp/client/core/contents/android/blimp_contents_impl_android.cc
index 172dba21bda68811645b533f22ab4ccfd7cdf66e..0712eac663695b385c6a1988a7e8ec2a45d38e8d 100644
--- a/blimp/client/core/contents/android/blimp_contents_impl_android.cc
+++ b/blimp/client/core/contents/android/blimp_contents_impl_android.cc
@@ -6,7 +6,9 @@
#include "base/android/jni_android.h"
#include "base/android/scoped_java_ref.h"
+#include "base/memory/ptr_util.h"
#include "blimp/client/core/contents/android/blimp_navigation_controller_impl_android.h"
+#include "blimp/client/core/contents/android/blimp_view.h"
#include "jni/BlimpContentsImpl_jni.h"
namespace blimp {
@@ -43,6 +45,13 @@ BlimpContentsImplAndroid::BlimpContentsImplAndroid(
env, reinterpret_cast<intptr_t>(this),
blimp_navigation_controller_impl_android_.GetJavaObject())
.obj());
+
+ blimp_view_ = base::MakeUnique<BlimpView>(
+ base::android::AttachCurrentThread(),
+ blimp_contents_impl_->GetNativeWindow(), java_obj_.obj());
+ Java_BlimpContentsImpl_setBlimpView(base::android::AttachCurrentThread(),
David Trainor- moved to gerrit 2016/08/29 05:29:33 Is there a way to clean this up? Maybe build the
nyquist 2016/08/29 19:09:19 Well, passing it in to the constructor is clean, n
+ java_obj_,
+ blimp_view_->GetJavaObject().obj());
}
void BlimpContentsImplAndroid::Destroy(JNIEnv* env, jobject jobj) {

Powered by Google App Engine
This is Rietveld 408576698