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

Unified Diff: chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

Issue 2449653002: [Contextual Search] Add support for a static icon (Closed)
Patch Set: Changes from donnd@ review Created 4 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
« no previous file with comments | « chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
diff --git a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
index e01e40cf573fba960fa8399d605415f008e910df..8d81cbeebab51b23394e495b20cdc263db06c172 100644
--- a/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
+++ b/chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc
@@ -63,8 +63,9 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
jint search_term_resource_id,
jint search_caption_resource_id,
jint search_bar_shadow_resource_id,
- jint panel_icon_resource_id,
+ jint sprite_resource_id,
jint search_provider_icon_sprite_metadata_resource_id,
+ jint static_icon_resource_id,
jint arrow_up_resource_id,
jint close_icon_resource_id,
jint progress_bar_background_resource_id,
@@ -103,10 +104,11 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
jfloat search_bar_shadow_opacity,
jboolean search_provider_icon_sprite_visible,
jfloat search_provider_icon_sprite_completion_percentage,
+ jboolean static_icon_visible,
jboolean thumbnail_visible,
- jfloat thumbnail_visibility_percentage,
- jint thumbnail_size,
jstring j_thumbnail_url,
+ jfloat static_image_visibility_percentage,
+ jint static_image_size,
jfloat arrow_icon_opacity,
jfloat arrow_icon_rotation,
jfloat close_icon_opacity,
@@ -153,8 +155,9 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
search_term_resource_id,
search_caption_resource_id,
search_bar_shadow_resource_id,
- panel_icon_resource_id,
+ sprite_resource_id,
search_provider_icon_sprite_metadata_resource_id,
+ static_icon_resource_id,
arrow_up_resource_id,
close_icon_resource_id,
progress_bar_background_resource_id,
@@ -191,9 +194,10 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
search_bar_shadow_opacity,
search_provider_icon_sprite_visible,
search_provider_icon_sprite_completion_percentage,
+ static_icon_visible,
thumbnail_visible,
- thumbnail_visibility_percentage,
- thumbnail_size,
+ static_image_visibility_percentage,
+ static_image_size,
arrow_icon_opacity,
arrow_icon_rotation,
close_icon_opacity,
« no previous file with comments | « chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698