Move remaining Blimp feature code to core.

blimp/client/core/contents/blimp_contents_impl.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_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "blimp/client/core/contents/blimp_contents_view.h"
 #include "blimp/client/core/contents/tab_control_feature.h"
 #include "blimp/client/public/contents/blimp_contents_observer.h"
 
 #if defined(OS_ANDROID)
 #include "blimp/client/core/contents/android/blimp_contents_impl_android.h"
 #endif  // OS_ANDROID
 
 namespace blimp {
 namespace client {
 
 namespace {
 
 #if defined(OS_ANDROID)
 const char kBlimpContentsImplAndroidKey[] = "blimp_contents_impl_android";
 #endif  // OS_ANDROID
 }
 
-BlimpContentsImpl::BlimpContentsImpl(int id,
-                                     ImeFeature* ime_feature,
-                                     NavigationFeature* navigation_feature,
-                                     TabControlFeature* tab_control_feature)
+BlimpContentsImpl::BlimpContentsImpl(

[Khushal, 2016/08/31 04:30:47]

Add a method to show/hide the BlimpContents and forward to the
BlimpCompositorManager?

[David Trainor- moved to gerrit, 2016/08/31 05:21:26]

Done.

+    int id,
+    BlimpCompositorDependencies* compositor_deps,
+    ImeFeature* ime_feature,
+    NavigationFeature* navigation_feature,
+    RenderWidgetFeature* render_widget_feature,
+    TabControlFeature* tab_control_feature)
     : navigation_controller_(this, navigation_feature),
+      compositor_manager_(render_widget_feature, compositor_deps),

[Khushal, 2016/08/31 04:30:47]

Now that we have this, we can set the layer correctly on the ViewAndroid in
BlimpContentsViewAndroid.

[David Trainor- moved to gerrit, 2016/08/31 05:21:27]

Done.

       id_(id),
       tab_control_feature_(tab_control_feature) {
   blimp_contents_view_ = BlimpContentsView::Create(this);
 }
 
 BlimpContentsImpl::~BlimpContentsImpl() {
   FOR_EACH_OBSERVER(BlimpContentsObserver, observers_, BlimpContentsDying());
 }
 
 #if defined(OS_ANDROID)
@@ skipping 40 matching lines @@
                     OnNavigationStateChanged());
 }
 
 void BlimpContentsImpl::SetSizeAndScale(const gfx::Size& size,
                                         float device_pixel_ratio) {
   tab_control_feature_->SetSizeAndScale(size, device_pixel_ratio);
 }
 
 }  // namespace client
 }  // namespace blimp