| Index: chrome/browser/android/compositor/layer/overlay_panel_layer.cc
|
| diff --git a/chrome/browser/android/compositor/layer/overlay_panel_layer.cc b/chrome/browser/android/compositor/layer/overlay_panel_layer.cc
|
| index 5645763f5a0ff0c9ebba33808760af8de9cd1729..99feaaab54a1e056aa1e84a2bf98be29dfd4a60a 100644
|
| --- a/chrome/browser/android/compositor/layer/overlay_panel_layer.cc
|
| +++ b/chrome/browser/android/compositor/layer/overlay_panel_layer.cc
|
| @@ -5,7 +5,6 @@
|
| #include "chrome/browser/android/compositor/layer/overlay_panel_layer.h"
|
|
|
| #include "cc/layers/layer.h"
|
| -#include "cc/layers/layer_settings.h"
|
| #include "cc/layers/nine_patch_layer.h"
|
| #include "cc/layers/solid_color_layer.h"
|
| #include "cc/layers/ui_resource_layer.h"
|
| @@ -258,27 +257,18 @@ void OverlayPanelLayer::SetProperties(
|
| }
|
| }
|
|
|
| -OverlayPanelLayer::OverlayPanelLayer(
|
| - ui::ResourceManager* resource_manager)
|
| +OverlayPanelLayer::OverlayPanelLayer(ui::ResourceManager* resource_manager)
|
| : resource_manager_(resource_manager),
|
| - layer_(cc::Layer::Create(cc::LayerSettings())),
|
| - panel_shadow_(
|
| - cc::NinePatchLayer::Create(cc::LayerSettings())),
|
| - bar_background_(
|
| - cc::SolidColorLayer::Create(cc::LayerSettings())),
|
| - bar_text_(
|
| - cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| - bar_shadow_(
|
| - cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| - panel_icon_(
|
| - cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| - close_icon_(
|
| - cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| - content_view_container_(
|
| - cc::SolidColorLayer::Create(cc::LayerSettings())),
|
| - text_container_(cc::Layer::Create(cc::LayerSettings())),
|
| - bar_border_(
|
| - cc::SolidColorLayer::Create(cc::LayerSettings())) {
|
| + 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()),
|
| + text_container_(cc::Layer::Create()),
|
| + bar_border_(cc::SolidColorLayer::Create()) {
|
| layer_->SetMasksToBounds(false);
|
| layer_->SetIsDrawable(true);
|
|
|
|
|