Remove ContentViewCore dependency from OverlayPanel

chrome/browser/android/compositor/layer/overlay_panel_layer.cc

 // Copyright 2015 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 "chrome/browser/android/compositor/layer/overlay_panel_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/public/browser/android/content_view_core.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/crushed_sprite_resource.h"
 #include "ui/android/resources/resource_manager.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/color_utils.h"
 
 namespace {
 
 const SkColor kBarBackgroundColor = SkColorSetRGB(0xff, 0xff, 0xff);
 const SkColor kBarBorderColor = SkColorSetRGB(0xf1, 0xf1, 0xf1);
@@ skipping 35 matching lines @@
     int close_icon_resource_id) {
   bar_text_resource_id_ = bar_text_resource_id;
   panel_shadow_resource_id_ = panel_shadow_resource_id;
   bar_shadow_resource_id_ = bar_shadow_resource_id;
   panel_icon_resource_id_ = panel_icon_resource_id;
   close_icon_resource_id_ = close_icon_resource_id;
 }
 
 void OverlayPanelLayer::SetProperties(
     float dp_to_px,
-    content::ContentViewCore* content_view_core,
-    float content_view_core_offset_y,
+    const scoped_refptr<cc::Layer>& content_layer,
+    float content_offset_y,
     float panel_x,
     float panel_y,
     float panel_width,
     float panel_height,
     float bar_margin_side,
     float bar_height,
     float bar_offset_y,
     float bar_text_opacity,
     bool bar_border_visible,
     float bar_border_height,
@@ skipping 109 matching lines @@
       bar_height / 2 -
       close_icon_resource->size.height() / 2;
 
   close_icon_->SetUIResourceId(close_icon_resource->ui_resource->id());
   close_icon_->SetBounds(close_icon_resource->size);
   close_icon_->SetPosition(
       gfx::PointF(close_icon_left, close_icon_top));
   close_icon_->SetOpacity(close_icon_opacity);
 
   // ---------------------------------------------------------------------------
-  // Content View
+  // Content
   // ---------------------------------------------------------------------------
-  content_view_container_->SetPosition(
-      gfx::PointF(0.f, content_view_core_offset_y));
-  content_view_container_->SetBounds(gfx::Size(panel_width, panel_height));
-  if (content_view_core && content_view_core->GetLayer()) {
-    scoped_refptr<cc::Layer> content_view_layer = content_view_core->GetLayer();
-    if (content_view_layer->parent() != content_view_container_)
-      content_view_container_->AddChild(content_view_layer);
+  content_container_->SetPosition(
+      gfx::PointF(0.f, content_offset_y));
+  content_container_->SetBounds(gfx::Size(panel_width, panel_height));
+  if (content_layer) {
+    if (content_layer->parent() != content_container_)
+      content_container_->AddChild(content_layer);
   } else {
-    content_view_container_->RemoveAllChildren();
+    content_container_->RemoveAllChildren();
   }
 
   // ---------------------------------------------------------------------------
   // Bar Shadow
   // ---------------------------------------------------------------------------
   if (bar_shadow_visible) {
     ui::ResourceManager::Resource* bar_shadow_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                        bar_shadow_resource_id_);
 
@@ skipping 38 matching lines @@
 
 OverlayPanelLayer::OverlayPanelLayer(ui::ResourceManager* resource_manager)
     : resource_manager_(resource_manager),
       layer_(cc::Layer::Create()),
       panel_shadow_(cc::NinePatchLayer::Create()),
       bar_background_(cc::SolidColorLayer::Create()),
       bar_text_(cc::UIResourceLayer::Create()),
       bar_shadow_(cc::UIResourceLayer::Create()),
       panel_icon_(cc::UIResourceLayer::Create()),
       close_icon_(cc::UIResourceLayer::Create()),
-      content_view_container_(cc::SolidColorLayer::Create()),
+      content_container_(cc::SolidColorLayer::Create()),
       text_container_(cc::Layer::Create()),
       bar_border_(cc::SolidColorLayer::Create()) {
   layer_->SetMasksToBounds(false);
   layer_->SetIsDrawable(true);
 
   // Panel Shadow
   panel_shadow_->SetIsDrawable(true);
   panel_shadow_->SetFillCenter(false);
   layer_->AddChild(panel_shadow_);
 
@@ skipping 10 matching lines @@
   // Panel Icon
   panel_icon_->SetIsDrawable(true);
 
   // The container that any text in the bar will be added to.
   text_container_->SetIsDrawable(true);
 
   // Close Icon
   close_icon_->SetIsDrawable(true);
   layer_->AddChild(close_icon_);
 
-  // Content View Container
-  content_view_container_->SetIsDrawable(true);
-  content_view_container_->SetBackgroundColor(kBarBackgroundColor);
-  layer_->AddChild(content_view_container_);
+  // Content Container
+  content_container_->SetIsDrawable(true);
+  content_container_->SetBackgroundColor(kBarBackgroundColor);
+  layer_->AddChild(content_container_);
 
   // Bar Border
   bar_border_->SetIsDrawable(true);
   bar_border_->SetBackgroundColor(kBarBorderColor);
 
   // Bar Shadow
   bar_shadow_->SetIsDrawable(true);
 }
 
 OverlayPanelLayer::~OverlayPanelLayer() {
 }
 
 scoped_refptr<cc::Layer> OverlayPanelLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome