Remove crushed sprite resource and layer

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 46 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 sprite_resource_id,
-    jint search_provider_icon_sprite_metadata_resource_id,
+    jint search_provider_icon_resource_id,
     jint quick_action_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,
@@ skipping 17 matching lines @@
     jfloat search_context_opacity,
     jfloat search_text_layer_min_height,
     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 quick_action_icon_visible,
     jboolean thumbnail_visible,
     jstring j_thumbnail_url,
-    jfloat static_image_visibility_percentage,
-    jint static_image_size,
+    jfloat custom_image_visibility_percentage,
+    jint bar_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,
     jfloat divider_line_visibility_percentage,
     jfloat divider_line_width,
     jfloat divider_line_height,
     jint divider_line_color,
     jfloat divider_line_x_offset,
     jboolean touch_highlight_visible,
     jfloat touch_highlight_x_offset,
     jfloat touch_highlight_width,
     jobject j_profile) {
-
   // Load the thumbnail if necessary.
   std::string thumbnail_url =
       base::android::ConvertJavaStringToUTF8(env, j_thumbnail_url);
   if (thumbnail_url != thumbnail_url_) {
     thumbnail_url_ = thumbnail_url;
     FetchThumbnail(j_profile);
   }
 
   // NOTE(pedrosimonetti): The WebContents might not exist at this time if
   // the Contextual Search Result has not been requested yet. In this case,
@@ skipping 12 matching lines @@
       filters.Append(
           cc::FilterOperation::CreateBrightnessFilter(base_page_brightness));
     }
     content_container_->SetFilters(filters);
   }
 
   // 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,
-      sprite_resource_id,
-      search_provider_icon_sprite_metadata_resource_id,
-      quick_action_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,
-      search_promo_height,
-      search_promo_opacity,
-      search_peek_promo_visible,
-      search_peek_promo_height,
-      search_peek_promo_padding,
-      search_peek_promo_ripple_width,
-      search_peek_promo_ripple_opacity,
-      search_peek_promo_text_opacity,
-      search_panel_x,
-      search_panel_y,
-      search_panel_width,
-      search_panel_height,
-      search_bar_margin_side,
-      search_bar_height,
-      search_context_opacity,
-      search_text_layer_min_height,
-      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,
-      quick_action_icon_visible,
-      thumbnail_visible,
-      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,
-      divider_line_visibility_percentage,
-      divider_line_width,
-      divider_line_height,
-      divider_line_color,
-      divider_line_x_offset,
-      touch_highlight_visible,
-      touch_highlight_x_offset,
-      touch_highlight_width);
+      search_bar_background_resource_id, search_context_resource_id,
+      search_term_resource_id, search_caption_resource_id,
+      search_bar_shadow_resource_id, search_provider_icon_resource_id,
+      quick_action_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, search_promo_height,
+      search_promo_opacity, search_peek_promo_visible, search_peek_promo_height,
+      search_peek_promo_padding, search_peek_promo_ripple_width,
+      search_peek_promo_ripple_opacity, search_peek_promo_text_opacity,
+      search_panel_x, search_panel_y, search_panel_width, search_panel_height,
+      search_bar_margin_side, search_bar_height, search_context_opacity,
+      search_text_layer_min_height, 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, quick_action_icon_visible, thumbnail_visible,
+      custom_image_visibility_percentage, bar_image_size, arrow_icon_opacity,
+      arrow_icon_rotation, close_icon_opacity, progress_bar_visible,
+      progress_bar_height, progress_bar_opacity, progress_bar_completion,
+      divider_line_visibility_percentage, divider_line_width,
+      divider_line_height, divider_line_color, divider_line_x_offset,
+      touch_highlight_visible, touch_highlight_x_offset, touch_highlight_width);
 
   // Make the layer visible if it is not already.
   contextual_search_layer_->layer()->SetHideLayerAndSubtree(false);
 }
 
 void ContextualSearchSceneLayer::FetchThumbnail(jobject j_profile) {
   if (thumbnail_url_.empty())
     return;
 
   GURL gurl(thumbnail_url_);
@@ skipping 52 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