Contextual Search UI changes for custom tabs

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 20 matching lines @@
  public:
   static scoped_refptr<ContextualSearchLayer> Create(
       ui::ResourceManager* resource_manager);
 
   void SetProperties(int search_bar_background_resource_id,
                      int search_bar_text_resource_id,
                      int search_bar_shadow_resource_id,
                      int search_provider_icon_resource_id,
                      int search_icon_resource_id,
                      int arrow_up_resource_id,
+                     int close_icon_resource_id,
                      int progress_bar_background_resource_id,
                      int progress_bar_resource_id,
                      int search_promo_resource_id,
                      content::ContentViewCore* content_view_core,
                      bool search_promo_visible,
                      float search_promo_height,
                      float search_promo_opacity,
                      float search_panel_y,
                      float search_panel_width,
                      float search_bar_margin_top,
                      float search_bar_margin_side,
                      float search_bar_height,
                      float search_bar_text_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 side_search_provider_icon_visible,
                      float search_provider_icon_opacity,
                      bool search_icon_visible,
                      float search_icon_opacity,
                      bool arrow_icon_visible,
                      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:
   ui::ResourceManager* resource_manager_;
 
   scoped_refptr<cc::Layer> layer_;
   scoped_refptr<cc::NinePatchLayer> search_bar_background_;
   scoped_refptr<cc::UIResourceLayer> search_bar_text_;
   scoped_refptr<cc::UIResourceLayer> search_bar_shadow_;
   scoped_refptr<cc::UIResourceLayer> search_provider_icon_;
   scoped_refptr<cc::UIResourceLayer> search_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_;
 };
 
 }  //  namespace android
 }  //  namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_COMPOSITOR_LAYER_CONTEXTUAL_SEARCH_LAYER_H_