Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: chrome/browser/android/compositor/layer/contextual_search_layer.cc

Issue 1783613004: CC Animation: Erase cc::LayerSettings everywhere. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@eraseandroid
Patch Set: Rebase. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/compositor/layer/contextual_search_layer.cc
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
index 0a7bd642b11142d9db1ea65b23d14e3ef37d3229..4ac96ad6013d55a41a44d411fd023e88de7a0ebc 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/android/compositor/layer/contextual_search_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"
@@ -406,25 +405,16 @@ void ContextualSearchLayer::SetProperties(
ContextualSearchLayer::ContextualSearchLayer(
ui::ResourceManager* resource_manager)
: OverlayPanelLayer(resource_manager),
- search_context_(
- cc::UIResourceLayer::Create(cc::LayerSettings())),
+ search_context_(cc::UIResourceLayer::Create()),
search_provider_icon_sprite_(CrushedSpriteLayer::Create()),
- arrow_icon_(
- cc::UIResourceLayer::Create(cc::LayerSettings())),
- search_promo_(
- cc::UIResourceLayer::Create(cc::LayerSettings())),
- search_promo_container_(
- cc::SolidColorLayer::Create(cc::LayerSettings())),
- peek_promo_container_(
- cc::SolidColorLayer::Create(cc::LayerSettings())),
- peek_promo_ripple_(
- cc::NinePatchLayer::Create(cc::LayerSettings())),
- peek_promo_text_(
- cc::UIResourceLayer::Create(cc::LayerSettings())),
- progress_bar_(
- cc::NinePatchLayer::Create(cc::LayerSettings())),
- progress_bar_background_(
- cc::NinePatchLayer::Create(cc::LayerSettings())) {
+ arrow_icon_(cc::UIResourceLayer::Create()),
+ search_promo_(cc::UIResourceLayer::Create()),
+ search_promo_container_(cc::SolidColorLayer::Create()),
+ peek_promo_container_(cc::SolidColorLayer::Create()),
+ peek_promo_ripple_(cc::NinePatchLayer::Create()),
+ peek_promo_text_(cc::UIResourceLayer::Create()),
+ progress_bar_(cc::NinePatchLayer::Create()),
+ progress_bar_background_(cc::NinePatchLayer::Create()) {
// Search Peek Promo
peek_promo_container_->SetIsDrawable(true);
peek_promo_container_->SetBackgroundColor(kSearchBarBackgroundColor);

Powered by Google App Engine
This is Rietveld 408576698