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

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

Issue 1219133003: Contextual Search UI changes for custom tabs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use fadingInPercentage and fadingOutPercentage, get rid of PanelBase#isCloseIconVisible() Created 5 years, 5 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 c1d578f05f77016a29abe7fd2523856cc7d278a7..7d9c975ef553040efa21414cfa2d8042718c4c7b 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.h
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.h
@@ -38,6 +38,7 @@ class ContextualSearchLayer : public Layer {
int search_provider_icon_resource_id,
int search_icon_resource_id,
int arrow_up_resource_id,
+ int close_icon_resource_id,
int progress_bar_background_resource_id,
int progress_bar_resource_id,
int search_promo_resource_id,
@@ -63,6 +64,8 @@ class ContextualSearchLayer : public Layer {
bool arrow_icon_visible,
float arrow_icon_opacity,
float arrow_icon_rotation,
+ bool close_icon_visible,
+ float close_icon_opacity,
bool progress_bar_visible,
float progress_bar_y,
float progress_bar_height,
@@ -85,6 +88,7 @@ class ContextualSearchLayer : public Layer {
scoped_refptr<cc::UIResourceLayer> search_provider_icon_;
scoped_refptr<cc::UIResourceLayer> search_icon_;
scoped_refptr<cc::UIResourceLayer> arrow_icon_;
+ scoped_refptr<cc::UIResourceLayer> close_icon_;
scoped_refptr<cc::Layer> content_view_container_;
scoped_refptr<cc::SolidColorLayer> search_bar_border_;
scoped_refptr<cc::NinePatchLayer> progress_bar_;

Powered by Google App Engine
This is Rietveld 408576698