[Contextual Search] Add close button in maximized state

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

Index: chrome/browser/android/compositor/layer/contextual_search_layer.cc
diff --git a/chrome/browser/android/compositor/layer/contextual_search_layer.cc b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
index 15f2b6f977cdf5e5ac241682d169b6cf434eee3c..404446ef6c851fd1cbc509466f7535d96ef132ff 100644
--- a/chrome/browser/android/compositor/layer/contextual_search_layer.cc
+++ b/chrome/browser/android/compositor/layer/contextual_search_layer.cc
@@ -62,7 +62,6 @@ void ContextualSearchLayer::SetProperties(
     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,
@@ -175,9 +174,6 @@ void ContextualSearchLayer::SetProperties(
   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;
@@ -213,39 +209,31 @@ void ContextualSearchLayer::SetProperties(
   // ---------------------------------------------------------------------------
   // 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_height / 2 -
-        close_icon_resource->size.height() / 2;
+  // Grab the Close Icon resource.
+  ui::ResourceManager::Resource* close_icon_resource =
+      resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
+                                     close_icon_resource_id);
 
-    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);
+  // 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 {
-    if (close_icon_.get() && close_icon_->parent())
-      close_icon_->RemoveFromParent();
+    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;
+
+  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
   // ---------------------------------------------------------------------------
@@ -456,9 +444,11 @@ ContextualSearchLayer::ContextualSearchLayer(
 
   // 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);