| Index: chrome/browser/android/compositor/decoration_title.cc
|
| diff --git a/chrome/browser/android/compositor/decoration_title.cc b/chrome/browser/android/compositor/decoration_title.cc
|
| index 7bbbf22edb43a0ba88c11cfb2d7d58fb4f431604..9eac9322d4c4c58baf2cfd1f7704a1df790a33b3 100644
|
| --- a/chrome/browser/android/compositor/decoration_title.cc
|
| +++ b/chrome/browser/android/compositor/decoration_title.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/i18n/rtl.h"
|
| #include "base/logging.h"
|
| #include "cc/layers/layer.h"
|
| +#include "cc/layers/layer_settings.h"
|
| #include "cc/layers/ui_resource_layer.h"
|
| #include "cc/resources/scoped_ui_resource.h"
|
| #include "chrome/browser/android/compositor/layer_title_cache.h"
|
| @@ -32,13 +33,13 @@ DecorationTitle::DecorationTitle(LayerTitleCache* layer_title_cache,
|
| int favicon_end_padding,
|
| bool is_incognito,
|
| bool is_rtl)
|
| - : layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
|
| + : layer_(cc::Layer::Create(cc::LayerSettings())),
|
| layer_opaque_(
|
| - cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| layer_fade_(
|
| - cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| layer_favicon_(
|
| - cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
|
| + cc::UIResourceLayer::Create(cc::LayerSettings())),
|
| title_resource_id_(title_resource_id),
|
| favicon_resource_id_(favicon_resource_id),
|
| spinner_resource_id_(spinner_resource_id),
|
|
|