Add BlimpView to a Chrome tab when Blimp is enabled.

blimp/client/core/contents/blimp_contents_view_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "blimp/client/core/contents/blimp_contents_view_android.h"
 
 #include "base/memory/ptr_util.h"
 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
+#include "blimp/client/core/contents/android/blimp_view.h"
 #include "cc/layers/layer.h"
+#include "ui/android/window_android.h"
 
 namespace blimp {
 namespace client {
 
 // static
 std::unique_ptr<BlimpContentsView> BlimpContentsView::Create(
     BlimpContentsImpl* blimp_contents) {
-  return base::MakeUnique<BlimpContentsViewAndroid>(
-      blimp_contents->GetBlimpContentsImplAndroid());
+  return base::MakeUnique<BlimpContentsViewAndroid>(blimp_contents);
 }
 
 BlimpContentsViewAndroid::BlimpContentsViewAndroid(
-    BlimpContentsImplAndroid* blimp_contents) {
-  // 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.
+    BlimpContentsImpl* blimp_contents) {
   // TODO(dtrainor): Use the layer from the compositor manager here instead when
   // it goes in the BlimpContents.
-  view_.SetLayer(cc::Layer::Create());
+  blimp_view_ = base::MakeUnique<BlimpView>(blimp_contents);
+  view_ = base::MakeUnique<ui::ViewAndroid>(
+      blimp_view_->CreateViewAndroidDelegate());
+  view_->SetLayer(cc::Layer::Create());
+  blimp_contents->GetNativeWindow()->AddChild(view_.get());
 }
 
+BlimpContentsViewAndroid::~BlimpContentsViewAndroid() = default;
+
 gfx::NativeView BlimpContentsViewAndroid::GetNativeView() {
-  return &view_;
+  return view_.get();
+}
+
+BlimpView* BlimpContentsViewAndroid::GetBlimpView() {
+  return blimp_view_.get();
 }
 
 }  // namespace client
 }  // namespace blimp