| Index: chrome/browser/android/compositor/layer/contextual_search_layer.h
|
| diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.h b/chrome/browser/android/compositor/layer/contextual_search_layer.h
|
| index 68e6a5d9018921342df250f95bdaa0fe56461332..bd0a5983ba366befe182456d39e79ae13969e759 100644
|
| --- a/chrome/browser/android/compositor/layer/contextual_search_layer.h
|
| +++ b/chrome/browser/android/compositor/layer/contextual_search_layer.h
|
| @@ -59,6 +59,8 @@ class ContextualSearchLayer : public Layer {
|
| float search_bar_border_height,
|
| bool search_bar_shadow_visible,
|
| float search_bar_shadow_opacity,
|
| + float search_provider_icon_sprite_size,
|
| + int search_provider_icon_sprite_frame,
|
| float arrow_icon_opacity,
|
| float arrow_icon_rotation,
|
| bool close_icon_visible,
|
| @@ -76,6 +78,10 @@ class ContextualSearchLayer : public Layer {
|
| ~ContextualSearchLayer() override;
|
|
|
| private:
|
| + // Uses the |sprite_frame| to determine the portion of
|
| + // search_provider_icon_sprite_ that gets drawn.
|
| + void SetSearchProviderIconSpriteFrame(int sprite_frame);
|
| +
|
| ui::ResourceManager* resource_manager_;
|
|
|
| scoped_refptr<cc::Layer> layer_;
|
| @@ -84,7 +90,7 @@ class ContextualSearchLayer : public Layer {
|
| scoped_refptr<cc::UIResourceLayer> search_context_;
|
| scoped_refptr<cc::UIResourceLayer> search_term_;
|
| scoped_refptr<cc::UIResourceLayer> search_bar_shadow_;
|
| - scoped_refptr<cc::UIResourceLayer> search_provider_icon_;
|
| + scoped_refptr<cc::UIResourceLayer> search_provider_icon_sprite_;
|
| scoped_refptr<cc::UIResourceLayer> arrow_icon_;
|
| scoped_refptr<cc::UIResourceLayer> close_icon_;
|
| scoped_refptr<cc::Layer> content_view_container_;
|
| @@ -93,6 +99,9 @@ class ContextualSearchLayer : public Layer {
|
| scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
|
| scoped_refptr<cc::UIResourceLayer> search_promo_;
|
| scoped_refptr<cc::SolidColorLayer> search_promo_container_;
|
| +
|
| + int search_provider_icon_sprites_per_row_;
|
| + int search_provider_icon_sprite_rows_;
|
| };
|
|
|
| } // namespace android
|
|
|