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

Unified Diff: chrome/browser/android/tab_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: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index a9c12960053437ff7c19302988e2ed59f301272b..a6684800c2dc231a23e9aa2ed64e5dd336a5d4c7 100644
--- a/chrome/browser/android/tab_android.cc
+++ b/chrome/browser/android/tab_android.cc
@@ -13,6 +13,7 @@
#include "base/trace_event/trace_event.h"
#include "blimp/client/public/blimp_client_context.h"
#include "blimp/client/public/contents/blimp_contents.h"
+#include "blimp/client/public/contents/blimp_contents_view.h"
#include "blimp/client/public/contents/blimp_navigation_controller.h"
#include "cc/layers/layer.h"
#include "chrome/browser/android/blimp/blimp_client_context_factory.h"
@@ -445,7 +446,8 @@ base::android::ScopedJavaLocalRef<jobject> TabAndroid::InitBlimpContents(
}
// Attach the layer holding the tab contents to the |content_layer_|.
- content_layer_->InsertChild(blimp_contents_->GetNativeView()->GetLayer(), 0);
+ content_layer_->InsertChild(
+ blimp_contents_->GetView()->GetNativeView()->GetLayer(), 0);
return blimp_contents_->GetJavaObject();
}

Powered by Google App Engine
This is Rietveld 408576698