[Contextual Search] Add support for crushed sprites and animate the search provider icon

chrome/browser/android/compositor/layer/contextual_search_layer.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/layer/layer.h"
@@ skipping 41 matching lines @@
                      float search_panel_height,
                      float search_bar_margin_side,
                      float search_bar_height,
                      float search_context_opacity,
                      float search_term_opacity,
                      bool search_bar_border_visible,
                      float search_bar_border_y,
                      float search_bar_border_height,
                      bool search_bar_shadow_visible,
                      float search_bar_shadow_opacity,
+                     bool search_provider_icon_visible,
+                     int search_provider_icon_sprites_per_row,
+                     int search_provider_icon_sprite_rows,
+                     int search_provider_icon_sprite_frame,
                      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,
                      float progress_bar_opacity,
                      int progress_bar_completion);
 
   scoped_refptr<cc::Layer> layer() override;
 
  protected:
   explicit ContextualSearchLayer(ui::ResourceManager* resource_manager);
   ~ContextualSearchLayer() override;
 
  private:
+  // Uses the |sprite_frame| to limit the portion of search_provider_icon_

[Changwan Ryu, 2015/09/14 01:51:30]

Nit: how about s/limit/determine/ ?

[Theresa, 2015/09/14 19:48:25]

Done.

+  // that gets drawn to an individual sprite.
+  void SetSearchProviderIconUV(int sprite_frame);
+
   ui::ResourceManager* resource_manager_;
 
   scoped_refptr<cc::Layer> layer_;
   scoped_refptr<cc::NinePatchLayer> panel_shadow_;
   scoped_refptr<cc::SolidColorLayer> search_bar_background_;
   scoped_refptr<cc::UIResourceLayer> search_context_;
   scoped_refptr<cc::UIResourceLayer> search_term_;
   scoped_refptr<cc::UIResourceLayer> search_bar_shadow_;
   scoped_refptr<cc::UIResourceLayer> search_provider_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_;
   scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
   scoped_refptr<cc::UIResourceLayer> search_promo_;
   scoped_refptr<cc::SolidColorLayer> search_promo_container_;
+
+  int search_provider_icon_sprites_per_row_;
+  int search_provider_icon_sprite_rows_;
 };
 
 }  //  namespace android
 }  //  namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_