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 30783f5a6992cdd674965873b991a49b2a6a0564..ea760e45ffb6cab1ab67d9579dea966fb13900f8 100644 |
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.h |
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.h |
@@ -27,6 +27,8 @@ class ResourceManager; |
namespace chrome { |
namespace android { |
+class CrushedSpriteLayer; |
+ |
class ContextualSearchLayer : public Layer { |
public: |
static scoped_refptr<ContextualSearchLayer> Create( |
@@ -36,7 +38,6 @@ class ContextualSearchLayer : public Layer { |
int search_context_resource_id, |
int search_term_resource_id, |
int search_bar_shadow_resource_id, |
- int search_provider_icon_resource_id, |
int arrow_up_resource_id, |
int close_icon_resource_id, |
int progress_bar_background_resource_id, |
@@ -59,6 +60,12 @@ class ContextualSearchLayer : public Layer { |
float search_bar_border_height, |
bool search_bar_shadow_visible, |
float search_bar_shadow_opacity, |
+ bool search_provider_icon_sprite_visible, |
+ float search_provider_icon_sprite_size, |
+ float search_provider_icon_sprite_scale, |
+ SkBitmap search_provider_icon_sprite_bitmap, |
+ std::vector<int> search_provider_icon_sprite_rects, |
+ bool search_provider_icon_sprite_paint_previous_frames, |
float arrow_icon_opacity, |
float arrow_icon_rotation, |
float close_icon_opacity, |
@@ -83,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<CrushedSpriteLayer> search_provider_icon_sprite_; |
scoped_refptr<cc::UIResourceLayer> arrow_icon_; |
scoped_refptr<cc::UIResourceLayer> close_icon_; |
scoped_refptr<cc::Layer> content_view_container_; |