[Contextual Search] Animate thumbnail appearance

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 <memory>
 
 #include "chrome/browser/android/compositor/layer/overlay_panel_layer.h"
@@ skipping 58 matching lines @@
                      float search_term_opacity,
                      float search_caption_animation_percentage,
                      bool search_caption_visible,
                      bool search_bar_border_visible,
                      float search_bar_border_height,
                      bool search_bar_shadow_visible,
                      float search_bar_shadow_opacity,
                      bool search_provider_icon_sprite_visible,
                      float search_provider_icon_sprite_completion_percentage,
                      bool thumbnail_visible,
+                     float thumbnail_visibility_percentage,
                      int thumbnail_size,
                      float arrow_icon_opacity,
                      float arrow_icon_rotation,
                      float close_icon_opacity,
                      bool progress_bar_visible,
                      float progress_bar_height,
                      float progress_bar_opacity,
                      int progress_bar_completion);
 
   void SetThumbnail(const SkBitmap* thumbnail);
 
  protected:
   explicit ContextualSearchLayer(ui::ResourceManager* resource_manager);
   ~ContextualSearchLayer() override;
   scoped_refptr<cc::Layer> GetIconLayer() override;
 
  private:
-  bool search_provider_icon_sprite_visible_;
-  int search_provider_icon_sprite_metadata_resource_id_;
-  float search_provider_icon_sprite_completion_percentage_;
-  bool thumbnail_visible_;
+  // Sets up |icon_layer_|, which displays an icon or thumbnail at the start
+  // of the Bar.
+  void SetupIconLayer(bool search_provider_icon_sprite_visible,
+                      int search_provider_icon_sprite_metadata_resource_id,
+                      float search_provider_icon_sprite_completion_percentage,
+                      bool thumbnail_visible,
+                      float thumbnail_visibility_percentage);
+
   int thumbnail_size_;
+  float thumbnail_side_margin_;
+  float thumbnail_top_margin_;
 
   scoped_refptr<cc::UIResourceLayer> search_context_;
+  scoped_refptr<cc::Layer> icon_layer_;
   scoped_refptr<CrushedSpriteLayer> search_provider_icon_sprite_;
   scoped_refptr<cc::UIResourceLayer> thumbnail_layer_;
   scoped_refptr<cc::UIResourceLayer> arrow_icon_;
   scoped_refptr<cc::UIResourceLayer> search_promo_;
   scoped_refptr<cc::SolidColorLayer> search_promo_container_;
   scoped_refptr<cc::SolidColorLayer> peek_promo_container_;
   scoped_refptr<cc::NinePatchLayer> peek_promo_ripple_;
   scoped_refptr<cc::UIResourceLayer> peek_promo_text_;
   scoped_refptr<cc::NinePatchLayer> progress_bar_;
   scoped_refptr<cc::NinePatchLayer> progress_bar_background_;
   scoped_refptr<cc::UIResourceLayer> search_caption_;
 };
 
 }  //  namespace android
 }  //  namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_