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 7735c39f0b16945b8da0bde44e6e864e365e82f3..7f2c8ef61a6bb0e1525e37fdc929a310375ce5a5 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 |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h" |
#include "base/android/jni_android.h" |
+#include "base/android/jni_array.h" |
#include "chrome/browser/android/compositor/layer/contextual_search_layer.h" |
#include "content/public/browser/android/content_view_core.h" |
#include "jni/ContextualSearchSceneLayer_jni.h" |
@@ -51,6 +52,10 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer( |
jfloat search_bar_border_height, |
jboolean search_bar_shadow_visible, |
jfloat search_bar_shadow_opacity, |
+ jboolean search_provider_icon_sprite_visible, |
+ jfloat search_provider_icon_sprite_size, |
+ jintArray search_provider_icon_sprite_rects, |
+ jboolean search_provider_icon_sprite_paint_previous_frames, |
jfloat arrow_icon_opacity, |
jfloat arrow_icon_rotation, |
jboolean close_icon_visible, |
@@ -80,6 +85,11 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer( |
: content::ContentViewCore::GetNativeContentViewCore( |
env, jcontent_view_core); |
+ std::vector<int> search_provider_icon_sprite_rects_array; |
+ base::android::JavaIntArrayToIntVector( |
+ env, search_provider_icon_sprite_rects, |
+ &search_provider_icon_sprite_rects_array); |
+ |
contextual_search_layer_->SetProperties( |
search_bar_background_resource_id, |
search_context_resource_id, |
@@ -108,6 +118,10 @@ void ContextualSearchSceneLayer::UpdateContextualSearchLayer( |
search_bar_border_height, |
search_bar_shadow_visible, |
search_bar_shadow_opacity, |
+ search_provider_icon_sprite_visible, |
+ search_provider_icon_sprite_size, |
+ search_provider_icon_sprite_rects_array, |
+ search_provider_icon_sprite_paint_previous_frames, |
arrow_icon_opacity, |
arrow_icon_rotation, |
close_icon_visible, |