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

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

Issue 2320923002: Add a full Blimp integration test. (Closed)
Patch Set: Fix build break with chrome embedder Created 4 years, 3 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_view.cc
diff --git a/blimp/client/core/contents/android/blimp_view.cc b/blimp/client/core/contents/android/blimp_view.cc
index 3183dda7fec5d4f8365364b9845f337941fa653d..9e7e4656ddd1fd4c16a1b6dcebf3ef4db1dda5e8 100644
--- a/blimp/client/core/contents/android/blimp_view.cc
+++ b/blimp/client/core/contents/android/blimp_view.cc
@@ -18,10 +18,9 @@ bool BlimpView::RegisterJni(JNIEnv* env) {
return RegisterNativesImpl(env);
}
-BlimpView::BlimpView(BlimpContentsImpl* blimp_contents_impl)
- : blimp_contents_impl_(blimp_contents_impl) {
- ui::WindowAndroid* window = blimp_contents_impl_->GetNativeWindow();
-
+BlimpView::BlimpView(ui::WindowAndroid* window,
+ BlimpContentsViewImpl* blimp_contents_view)
+ : blimp_contents_view_(blimp_contents_view) {
JNIEnv* env = base::android::AttachCurrentThread();
java_obj_.Reset(env,
Java_BlimpView_create(env, reinterpret_cast<intptr_t>(this),
@@ -49,7 +48,7 @@ void BlimpView::OnSizeChanged(JNIEnv* env,
jint width,
jint height,
jfloat device_scale_factor_dp_to_px) {
- blimp_contents_impl_->SetSizeAndScale(gfx::Size(width, height),
+ blimp_contents_view_->SetSizeAndScale(gfx::Size(width, height),
device_scale_factor_dp_to_px);
}
@@ -94,7 +93,7 @@ jboolean BlimpView::OnTouchEvent(
android_action, pointer_count, history_size, action_index,
android_button_state, android_meta_state, raw_pos_x - pos_x_0,
raw_pos_y - pos_y_0, pointer0, pointer1);
- return blimp_contents_impl_->compositor_manager()->OnTouchEvent(event);
+ return blimp_contents_view_->OnTouchEvent(event);
}
} // namespace client

Powered by Google App Engine
This is Rietveld 408576698