| 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() {
|
|
|