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

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: Now owned by BlimpContentsViewAndroid and also implemented touch and sizing 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..6667212bd044513c669e9f08963f25ea2be8284d 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,10 @@
#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 "blimp/client/core/contents/blimp_contents_view_android.h"
#include "jni/BlimpContentsImpl_jni.h"
namespace blimp {
@@ -36,12 +39,16 @@ BlimpContentsImplAndroid::BlimpContentsImplAndroid(
blimp_navigation_controller_impl_android_(
static_cast<BlimpNavigationControllerImpl*>(
&(blimp_contents_impl->GetNavigationController()))) {
- JNIEnv* env = base::android::AttachCurrentThread();
+ BlimpView* blimp_view = static_cast<BlimpContentsViewAndroid*>(
+ blimp_contents_impl_->GetBlimpContentsView())
+ ->GetBlimpView();
+ JNIEnv* env = base::android::AttachCurrentThread();
java_obj_.Reset(env,
Java_BlimpContentsImpl_create(
env, reinterpret_cast<intptr_t>(this),
- blimp_navigation_controller_impl_android_.GetJavaObject())
+ blimp_navigation_controller_impl_android_.GetJavaObject(),
+ blimp_view->GetJavaObject())
.obj());
}

Powered by Google App Engine
This is Rietveld 408576698