[Contextual Search] Add support for a static icon

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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 "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
@@ skipping 45 matching lines @@
 }
 
 void ContextualSearchSceneLayer::UpdateContextualSearchLayer(
     JNIEnv* env,
     const JavaParamRef<jobject>& object,
     jint search_bar_background_resource_id,
     jint search_context_resource_id,
     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,
     jint progress_bar_resource_id,
     jint search_promo_resource_id,
     jint peek_promo_ripple_resource_id,
     jint peek_promo_text_resource_id,
     jfloat dp_to_px,
     jfloat base_page_brightness,
     jfloat base_page_offset,
@@ skipping 18 matching lines @@
     jfloat search_term_opacity,
     jfloat search_term_caption_spacing,
     jfloat search_caption_animation_percentage,
     jboolean search_caption_visible,
     jboolean search_bar_border_visible,
     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_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,
     jboolean progress_bar_visible,
     jfloat progress_bar_height,
     jfloat progress_bar_opacity,
     jint progress_bar_completion,
     jobject j_profile) {
 
   // Load the thumbnail if necessary.
@@ skipping 26 matching lines @@
 
   // Move the base page contents up.
   content_container_->SetPosition(gfx::PointF(0.0f, base_page_offset));
 
   contextual_search_layer_->SetProperties(
       search_bar_background_resource_id,
       search_context_resource_id,
       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,
       progress_bar_resource_id,
       search_promo_resource_id,
       peek_promo_ripple_resource_id,
       peek_promo_text_resource_id,
       dp_to_px,
       content_layer,
       search_promo_visible,
@@ skipping 16 matching lines @@
       search_term_opacity,
       search_term_caption_spacing,
       search_caption_animation_percentage,
       search_caption_visible,
       search_bar_border_visible,
       search_bar_border_height,
       search_bar_shadow_visible,
       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,
       progress_bar_visible,
       progress_bar_height,
       progress_bar_opacity,
       progress_bar_completion);
 
   // Make the layer visible if it is not already.
   contextual_search_layer_->layer()->SetHideLayerAndSubtree(false);
@@ skipping 58 matching lines @@
   ContextualSearchSceneLayer* tree_provider =
       new ContextualSearchSceneLayer(env, jobj);
   return reinterpret_cast<intptr_t>(tree_provider);
 }
 
 bool RegisterContextualSearchSceneLayer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android