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

Unified Diff: chrome/browser/android/tab_android.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
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/TabBlimpContentsObserver.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/tab_android.cc
diff --git a/chrome/browser/android/tab_android.cc b/chrome/browser/android/tab_android.cc
index 34dd08784d6b27ae30a133a2379b5dbd59bd0f50..b092461ba9ef647010f24e52c8dce301774d41b4 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"
@@ -448,7 +449,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();
}
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/tab/TabBlimpContentsObserver.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698