| Index: chrome/browser/android/compositor/layer/tab_layer.cc
|
| diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc
|
| index f3f263eb65d4dd4bf7e363061c06ebd78cc91856..a33e085aba18e0d547ef1dbf98b0d512a42753b1 100644
|
| --- a/chrome/browser/android/compositor/layer/tab_layer.cc
|
| +++ b/chrome/browser/android/compositor/layer/tab_layer.cc
|
| @@ -7,6 +7,7 @@
|
| #include "base/i18n/rtl.h"
|
| #include "cc/layers/layer.h"
|
| #include "cc/layers/layer_lists.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"
|
| @@ -585,23 +586,23 @@ TabLayer::TabLayer(bool incognito,
|
| : incognito_(incognito),
|
| resource_manager_(resource_manager),
|
| layer_title_cache_(layer_title_cache),
|
| - layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
|
| + layer_(cc::Layer::Create(cc::LayerSettings())),
|
| toolbar_layer_(ToolbarLayer::Create(resource_manager)),
|
| - title_(cc::Layer::Create(content::Compositor::LayerSettings())),
|
| + title_(cc::Layer::Create(cc::LayerSettings())),
|
| content_(ContentLayer::Create(tab_content_manager)),
|
| padding_(
|
| - cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::SolidColorLayer::Create(cc::LayerSettings())),
|
| close_button_(
|
| - cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| front_border_(
|
| - cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::NinePatchLayer::Create(cc::LayerSettings())),
|
| front_border_inner_shadow_(
|
| - cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::NinePatchLayer::Create(cc::LayerSettings())),
|
| contour_shadow_(
|
| - cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
|
| - shadow_(cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::NinePatchLayer::Create(cc::LayerSettings())),
|
| + shadow_(cc::NinePatchLayer::Create(cc::LayerSettings())),
|
| back_logo_(
|
| - cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| brightness_(1.f) {
|
| layer_->AddChild(shadow_);
|
| layer_->AddChild(contour_shadow_);
|
|
|