[Contextual Search] Add close button in maximized state

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 44 matching lines @@
     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,
     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) {
   // Grabs the dynamic Search Bar Text resource.
   ui::ResourceManager::Resource* search_context_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
                                      search_context_resource_id);
@@ skipping 92 matching lines @@
   search_provider_icon_->SetPosition(
       gfx::PointF(search_provider_icon_left, search_provider_icon_top));
 
   // ---------------------------------------------------------------------------
   // Arrow Icon
   // ---------------------------------------------------------------------------
   // Grabs the Search Arrow Icon resource.
   ui::ResourceManager::Resource* arrow_icon_resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                      arrow_up_resource_id);
-  if (arrow_icon_->parent() != layer_) {
-    layer_->AddChild(arrow_icon_);
-  }
 
   // Positions the icon at the end of the Search Bar.
   float arrow_icon_left;
   if (is_rtl) {
     arrow_icon_left = search_bar_margin_side;
   } else {
     arrow_icon_left = search_panel_width -
         arrow_icon_resource->size.width() - search_bar_margin_side;
   }
 
@@ skipping 15 matching lines @@
     gfx::PointF pivot_origin(pivot_x, pivot_y);
     transform.Translate(pivot_origin.x(), pivot_origin.y());
     transform.RotateAboutZAxis(arrow_icon_rotation);
     transform.Translate(-pivot_origin.x(), -pivot_origin.y());
   }
   arrow_icon_->SetTransform(transform);
 
   // ---------------------------------------------------------------------------
   // 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_);
-    }
+  // Grab the Close Icon resource.
+  ui::ResourceManager::Resource* close_icon_resource =
+      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
+                                     close_icon_resource_id);
 
-    // 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;
-    }
+  // 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_height / 2 -
-        close_icon_resource->size.height() / 2;
+  // Centers the Close Icon vertically in the Search Bar.
+  float close_icon_top =
+      search_bar_height / 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();
-  }
+  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);
 
   // ---------------------------------------------------------------------------
   // Search Promo
   // ---------------------------------------------------------------------------
   if (search_promo_visible) {
     // Grabs 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
@@ skipping 191 matching lines @@
   layer_->AddChild(search_context_);
   search_term_->SetIsDrawable(true);
   layer_->AddChild(search_term_);
 
   // Search Provider Icon
   search_provider_icon_->SetIsDrawable(true);
   layer_->AddChild(search_provider_icon_);
 
   // Arrow Icon
   arrow_icon_->SetIsDrawable(true);
+  layer_->AddChild(arrow_icon_);
 
   // Close Icon
   close_icon_->SetIsDrawable(true);
+  layer_->AddChild(close_icon_);
 
   // 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);
 
@@ skipping 14 matching lines @@
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 scoped_refptr<cc::Layer> ContextualSearchLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome