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

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

Issue 1379183003: [ContextualSearch] Adds long press promo for Contextual Search. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing more comments 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 30783f5a6992cdd674965873b991a49b2a6a0564..e585f4f4973ce4871ba151f2b9bbb4062c1cd8b1 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.h
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.h
@@ -42,10 +42,18 @@ class ContextualSearchLayer : public Layer {
int progress_bar_background_resource_id,
int progress_bar_resource_id,
int search_promo_resource_id,
+ int peek_promo_ripple_resource_id,
+ int peek_promo_text_resource_id,
content::ContentViewCore* content_view_core,
bool search_promo_visible,
float search_promo_height,
float search_promo_opacity,
+ bool search_peek_promo_visible,
+ float search_peek_promo_height,
+ float search_peek_promo_padding,
+ float search_peek_promo_ripple_width,
+ float search_peek_promo_ripple_opacity,
+ float search_peek_promo_text_opacity,
float search_panel_x,
float search_panel_y,
float search_panel_width,
@@ -55,7 +63,6 @@ class ContextualSearchLayer : public Layer {
float search_context_opacity,
float search_term_opacity,
bool search_bar_border_visible,
- float search_bar_border_y,
float search_bar_border_height,
bool search_bar_shadow_visible,
float search_bar_shadow_opacity,
@@ -63,7 +70,6 @@ class ContextualSearchLayer : public Layer {
float arrow_icon_rotation,
float close_icon_opacity,
bool progress_bar_visible,
- float progress_bar_y,
float progress_bar_height,
float progress_bar_opacity,
int progress_bar_completion);
@@ -92,6 +98,10 @@ class ContextualSearchLayer : public Layer {
scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
scoped_refptr<cc::UIResourceLayer> search_promo_;
scoped_refptr<cc::SolidColorLayer> search_promo_container_;
+
+ scoped_refptr<cc::SolidColorLayer> peek_promo_container_;
+ scoped_refptr<cc::NinePatchLayer> peek_promo_ripple_;
+ scoped_refptr<cc::UIResourceLayer> peek_promo_text_;
};
} // namespace android

Powered by Google App Engine
This is Rietveld 408576698