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

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

Issue 1337703002: [Contextual Search] Add support for crushed sprites and animate the search provider icon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Very small changes from last pedrosimonneti@ review Created 5 years, 2 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.h
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.h b/chrome/browser/android/compositor/layer/contextual_search_layer.h
index e585f4f4973ce4871ba151f2b9bbb4062c1cd8b1..7a7bfd28308e95a0ca4c99d2259eb344baa020cf 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,7 @@ 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 panel_icon_resource_id,
int arrow_up_resource_id,
int close_icon_resource_id,
int progress_bar_background_resource_id,
@@ -44,6 +46,8 @@ class ContextualSearchLayer : public Layer {
int search_promo_resource_id,
int peek_promo_ripple_resource_id,
int peek_promo_text_resource_id,
+ int search_provider_icon_sprite_bitmap_resource_id,
+ int search_provider_icon_sprite_metadata_resource_id,
content::ContentViewCore* content_view_core,
bool search_promo_visible,
float search_promo_height,
@@ -66,6 +70,9 @@ 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_completion_percentage,
+ float search_provider_icon_sprite_size,
float arrow_icon_opacity,
float arrow_icon_rotation,
float close_icon_opacity,
@@ -89,7 +96,8 @@ 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> panel_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_;

Powered by Google App Engine
This is Rietveld 408576698