chrome/browser/android/compositor/layer/contextual_search_layer.cc - Issue 1747783002: CC Animation: Erase old animation system in Android Compositor.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1747783002: CC Animation: Erase old animation system in Android Compositor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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

« no previous file with comments | « chrome/browser/android/compositor/layer/content_layer.cc ('k') | chrome/browser/android/compositor/layer/crushed_sprite_layer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 7e0c7b07000d01a8c1c18d90fe1b35b9a97700df..0a7bd642b11142d9db1ea65b23d14e3ef37d3229 100644

--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc

+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc

@@ -5,6 +5,7 @@

#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,24 +407,24 @@ ContextualSearchLayer::ContextualSearchLayer(

ui::ResourceManager* resource_manager)

: OverlayPanelLayer(resource_manager),

search_context_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

search_provider_icon_sprite_(CrushedSpriteLayer::Create()),

arrow_icon_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

search_promo_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

search_promo_container_(

- cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),

+ cc::SolidColorLayer::Create(cc::LayerSettings())),

peek_promo_container_(

- cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),

+ cc::SolidColorLayer::Create(cc::LayerSettings())),

peek_promo_ripple_(

- cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),

+ cc::NinePatchLayer::Create(cc::LayerSettings())),

peek_promo_text_(

- cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),

+ cc::UIResourceLayer::Create(cc::LayerSettings())),

progress_bar_(

- cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),

+ cc::NinePatchLayer::Create(cc::LayerSettings())),

progress_bar_background_(

- cc::NinePatchLayer::Create(content::Compositor::LayerSettings())) {

+ cc::NinePatchLayer::Create(cc::LayerSettings())) {

// Search Peek Promo

peek_promo_container_->SetIsDrawable(true);

peek_promo_container_->SetBackgroundColor(kSearchBarBackgroundColor);