Contextual Search UI changes for custom tabs

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

 // 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.
 
 #include "chrome/browser/android/compositor/layer/contextual_search_layer.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
@@ skipping 20 matching lines @@
   return make_scoped_refptr(new ContextualSearchLayer(resource_manager));
 }
 
 void ContextualSearchLayer::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,
     float search_provider_icon_opacity,
     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) {
   // Grab the dynamic Search Bar Text resource.
   ui::ResourceManager::Resource* search_bar_text_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
                                      search_bar_text_resource_id);
 
@@ skipping 66 matching lines @@
   float search_icon_left;
   if (is_rtl) {
     search_icon_left = search_panel_width -
         search_icon_resource->size.width() - search_bar_margin_side;
   } else {
     search_icon_left = search_bar_margin_side;
   }
 
   // Centers the Search Icon vertically in the Search Bar.
   float search_icon_top =
-      search_bar_margin_top + (search_bar_height - search_bar_margin_top) / 2 -
-      search_icon_resource->size.height() / 2;
+      search_bar_margin_top + (search_bar_height - search_bar_margin_top) / 2
+      - search_icon_resource->size.height() / 2;

[pedro (no code reviews), 2015/07/08 20:15:05]

Nit: Differently from Java, the operator should be placed in the previous line.

[Theresa, 2015/07/08 21:04:59]

Done.

   search_icon_->SetUIResourceId(search_icon_resource->ui_resource->id());
   search_icon_->SetBounds(search_icon_resource->size);
   search_icon_->SetPosition(
       gfx::PointF(search_icon_left, search_icon_top));
   search_icon_->SetOpacity(search_icon_opacity);
 
   // ---------------------------------------------------------------------------
   // Arrow Icon
   // ---------------------------------------------------------------------------
   if (arrow_icon_visible) {
@@ skipping 35 matching lines @@
       transform.RotateAboutZAxis(arrow_icon_rotation);
       transform.Translate(-pivot_origin.x(), -pivot_origin.y());
     }
     arrow_icon_->SetTransform(transform);
   } else {
     if (arrow_icon_.get() && arrow_icon_->parent())
       arrow_icon_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
+  // Close Icon
+  // ---------------------------------------------------------------------------
+  if (close_icon_visible) {
+    // Grab the Close Icon resource.
+    ui::ResourceManager::Resource* close_icon_resource =
+        resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
+                                       close_icon_resource_id);
+    if (close_icon_->parent() != layer_) {
+      layer_->AddChild(close_icon_);
+    }
+
+    // Positions the icon at the end of the Search Bar.
+    float close_icon_left;
+    if (is_rtl) {
+      close_icon_left = search_bar_margin_side;
+    } else {
+      close_icon_left = search_panel_width -
+          close_icon_resource->size.width() - search_bar_margin_side;
+    }
+
+    // Centers the Close Icon vertically in the Search Bar.
+    float close_icon_top = search_bar_margin_top +
+        (search_bar_height - search_bar_margin_top) / 2 -
+        close_icon_resource->size.height() / 2;
+
+    close_icon_->SetUIResourceId(close_icon_resource->ui_resource->id());
+    close_icon_->SetBounds(close_icon_resource->size);
+    close_icon_->SetPosition(
+        gfx::PointF(close_icon_left, close_icon_top));
+    close_icon_->SetOpacity(close_icon_opacity);
+  } else {
+    if (close_icon_.get() && close_icon_->parent())
+      close_icon_->RemoveFromParent();
+  }
+
+  // ---------------------------------------------------------------------------
   // Search Promo
   // ---------------------------------------------------------------------------
   if (search_promo_visible) {
     // Grab the Search Opt Out Promo resource.
     ui::ResourceManager::Resource* search_promo_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
                                        search_promo_resource_id);
     // Search Promo Container
     if (search_promo_container_->parent() != layer_) {
       // NOTE(pedrosimonetti): The Promo layer should be always placed before
@@ skipping 148 matching lines @@
       search_bar_text_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       search_bar_shadow_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       search_provider_icon_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       search_icon_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       arrow_icon_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+      close_icon_(
+          cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
       content_view_container_(
           cc::Layer::Create(content::Compositor::LayerSettings())),
       search_bar_border_(
           cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
       progress_bar_(
           cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
       progress_bar_background_(
           cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
       search_promo_(
           cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
@@ skipping 15 matching lines @@
   search_provider_icon_->SetIsDrawable(true);
   layer_->AddChild(search_provider_icon_);
 
   // Search Icon
   search_icon_->SetIsDrawable(true);
   layer_->AddChild(search_icon_);
 
   // Arrow Icon
   arrow_icon_->SetIsDrawable(true);
 
+  // Close Icon
+  close_icon_->SetIsDrawable(true);
+
   // Search Opt Out Promo
   search_promo_container_->SetIsDrawable(true);
   search_promo_container_->SetBackgroundColor(kSearchBackgroundColor);
   search_promo_->SetIsDrawable(true);
 
   // Search Bar Border
   search_bar_border_->SetIsDrawable(true);
   search_bar_border_->SetBackgroundColor(kSearchBarBorderColor);
 
   // Progress Bar Background
@@ skipping 13 matching lines @@
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 scoped_refptr<cc::Layer> ContextualSearchLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome