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

Unified Diff: blimp/client/core/contents/blimp_contents_view_android.cc

Issue 2292723003: Move remaining Blimp feature code to core. (Closed)
Patch Set: Fix build break 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/blimp_contents_view_android.cc
diff --git a/blimp/client/core/contents/blimp_contents_view_android.cc b/blimp/client/core/contents/blimp_contents_view_android.cc
index ce32fc5369d61da8493629cc329c3a53c4d34cf8..2ade9c31ada69c2376e62df5291e1e672b17b75e 100644
--- a/blimp/client/core/contents/blimp_contents_view_android.cc
+++ b/blimp/client/core/contents/blimp_contents_view_android.cc
@@ -13,19 +13,19 @@ namespace client {
// static
std::unique_ptr<BlimpContentsView> BlimpContentsView::Create(
- BlimpContentsImpl* blimp_contents) {
+ BlimpContentsImpl* blimp_contents,
+ scoped_refptr<cc::Layer> contents_layer) {
return base::MakeUnique<BlimpContentsViewAndroid>(
- blimp_contents->GetBlimpContentsImplAndroid());
+ blimp_contents->GetBlimpContentsImplAndroid(), contents_layer);
}
BlimpContentsViewAndroid::BlimpContentsViewAndroid(
- BlimpContentsImplAndroid* blimp_contents) {
+ BlimpContentsImplAndroid* blimp_contents,
+ scoped_refptr<cc::Layer> contents_layer) {
// TODO(khushalsagar): Get the ViewAndroidDelegate from java after it has a
// BlimpView. Also get the WindowAndroid so this view can add itself as a
// child to it.
- // TODO(dtrainor): Use the layer from the compositor manager here instead when
- // it goes in the BlimpContents.
- view_.SetLayer(cc::Layer::Create());
+ view_.SetLayer(contents_layer);
}
gfx::NativeView BlimpContentsViewAndroid::GetNativeView() {
« no previous file with comments | « blimp/client/core/contents/blimp_contents_view_android.h ('k') | blimp/client/core/contents/blimp_contents_view_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698