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

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

Issue 2320923002: Add a full Blimp integration test. (Closed)
Patch Set: Fixed this a bit more. Still some thread violations :(. 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_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 925528360bb5042c93f8805d9f6cfef526158981..dd6dc379f2b1079cc519061221ae44b0b1dd1cfd 100644
--- a/blimp/client/core/contents/android/blimp_contents_impl_android.cc
+++ b/blimp/client/core/contents/android/blimp_contents_impl_android.cc
@@ -9,7 +9,7 @@
#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 "blimp/client/core/contents/blimp_contents_view_impl_android.h"
#include "jni/BlimpContentsImpl_jni.h"
namespace blimp {
@@ -39,8 +39,8 @@ BlimpContentsImplAndroid::BlimpContentsImplAndroid(
blimp_navigation_controller_impl_android_(
static_cast<BlimpNavigationControllerImpl*>(
&(blimp_contents_impl->GetNavigationController()))) {
- BlimpView* blimp_view = static_cast<BlimpContentsViewAndroid*>(
- blimp_contents_impl_->GetBlimpContentsView())
+ BlimpView* blimp_view = static_cast<BlimpContentsViewImplAndroid*>(
+ blimp_contents_impl_->GetView())
->GetBlimpView();
JNIEnv* env = base::android::AttachCurrentThread();

Powered by Google App Engine
This is Rietveld 408576698