[Contextual Search] Add a handle to the bar when Chrome Home is enabled

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

 // Copyright 2015 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/overlay_panel_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 29 matching lines @@
   panel_icon_->SetUIResourceId(panel_icon_resource->ui_resource()->id());
   panel_icon_->SetBounds(panel_icon_resource->size());
 
   return panel_icon_;
 }
 
 void OverlayPanelLayer::AddBarTextLayer(scoped_refptr<cc::Layer> text_layer) {
   text_container_->AddChild(text_layer);
 }
 
-void OverlayPanelLayer::SetResourceIds(
-    int bar_text_resource_id,
-    int panel_shadow_resource_id,
-    int bar_shadow_resource_id,
-    int panel_icon_resource_id,
-    int close_icon_resource_id) {
+void OverlayPanelLayer::SetResourceIds(int bar_text_resource_id,
+                                       int panel_shadow_resource_id,
+                                       int bar_shadow_resource_id,
+                                       int panel_icon_resource_id,
+                                       int close_icon_resource_id,
+                                       int handle_resource_id) {
   bar_text_resource_id_ = bar_text_resource_id;
   panel_shadow_resource_id_ = panel_shadow_resource_id;
   bar_shadow_resource_id_ = bar_shadow_resource_id;
   panel_icon_resource_id_ = panel_icon_resource_id;
   close_icon_resource_id_ = close_icon_resource_id;
+  bar_handle_resource_id_ = handle_resource_id;
 }
 
 void OverlayPanelLayer::SetProperties(
     float dp_to_px,
     const scoped_refptr<cc::Layer>& content_layer,
     float content_offset_y,
     float panel_x,
     float panel_y,
     float panel_width,
     float panel_height,
     float bar_margin_side,
     float bar_height,
     float bar_offset_y,
     float bar_text_opacity,
     bool bar_border_visible,
     float bar_border_height,
     bool bar_shadow_visible,
     float bar_shadow_opacity,
-    float close_icon_opacity) {
-
+    float close_icon_opacity,
+    float bar_handle_offset_y,
+    float bar_padding_bottom) {
   // Grabs required static resources.
   ui::NinePatchResource* panel_shadow_resource =
       ui::NinePatchResource::From(resource_manager_->GetResource(
           ui::ANDROID_RESOURCE_TYPE_STATIC, panel_shadow_resource_id_));
 
   DCHECK(panel_shadow_resource);
 
   // Round values to avoid pixel gap between layers.
   bar_height = floor(bar_height);
 
@@ skipping 21 matching lines @@
   panel_shadow_->SetPosition(shadow_position);
 
   // ---------------------------------------------------------------------------
   // Bar Background
   // ---------------------------------------------------------------------------
   gfx::Size background_size(panel_width, bar_height);
   bar_background_->SetBounds(background_size);
   bar_background_->SetPosition(gfx::PointF(0.f, bar_top));
 
   // ---------------------------------------------------------------------------
+  // Bar Handle
+  // ---------------------------------------------------------------------------
+
+  float bar_content_top = bar_top;
+  bar_content_height_ = bar_height - bar_padding_bottom;
+
+  if (bar_handle_resource_id_ != 0) {

[mdjones, 2017/04/07 15:47:13]

Do you think it makes sense to lazily create the layer here instead of in the
constructor? Or does that go against the style?

[Theresa, 2017/04/07 16:26:43]

Done.

+    if (bar_handle_->parent() != layer_)
+      layer_->AddChild(bar_handle_);
+
+    // Grab the bar handle resource.
+    ui::Resource* bar_handle_resource = resource_manager_->GetResource(
+        ui::ANDROID_RESOURCE_TYPE_DYNAMIC, bar_handle_resource_id_);
+
+    // Center the handle horizontally.
+    float bar_handle_left =
+        (panel_width - bar_handle_resource->size().width()) / 2;
+    float bar_handle_top = bar_top + bar_handle_offset_y;
+
+    bar_handle_->SetUIResourceId(bar_handle_resource->ui_resource()->id());
+    bar_handle_->SetBounds(bar_handle_resource->size());
+    bar_handle_->SetPosition(gfx::PointF(bar_handle_left, bar_handle_top));
+
+    bar_content_top = bar_handle_top + bar_handle_resource->size().height();
+    bar_content_height_ = bar_height - bar_content_top - bar_padding_bottom;
+  }
+
+  // ---------------------------------------------------------------------------
+  // Bar Content Layer
+  // ---------------------------------------------------------------------------
+  bar_content_layer_->SetBounds(gfx::Size(panel_width, bar_content_height_));
+  bar_content_layer_->SetPosition(gfx::PointF(0.f, bar_content_top));
+
+  // ---------------------------------------------------------------------------
   // Bar Text
   // ---------------------------------------------------------------------------
   ui::Resource* bar_text_resource = resource_manager_->GetResource(
       ui::ANDROID_RESOURCE_TYPE_DYNAMIC, bar_text_resource_id_);
 
   if (bar_text_resource) {
     // Centers the text vertically in the Search Bar.
     float bar_padding_top =
-        bar_top + bar_height / 2 - bar_text_resource->size().height() / 2;
+        (bar_content_height_ - bar_text_resource->size().height()) / 2;
     bar_text_->SetUIResourceId(bar_text_resource->ui_resource()->id());
     bar_text_->SetBounds(bar_text_resource->size());
     bar_text_->SetPosition(gfx::PointF(0.f, bar_padding_top));
     bar_text_->SetOpacity(bar_text_opacity);
   }
 
   // ---------------------------------------------------------------------------
   // Panel Icon
   // ---------------------------------------------------------------------------
   scoped_refptr<cc::Layer> icon_layer = GetIconLayer();
   if (icon_layer) {
     // If the icon is not the default width, add or remove padding so it appears
     // centered.
     float icon_padding = (kDefaultIconWidthDp * dp_to_px -
         icon_layer->bounds().width()) / 2.0f;
 
     // Positions the Icon at the start of the bar.
     float icon_x;
     if (is_rtl) {
       icon_x = panel_width - icon_layer->bounds().width() -
           (bar_margin_side + icon_padding);
     } else {
       icon_x = bar_margin_side + icon_padding;
     }
 
     // Centers the Icon vertically in the bar.
-    float icon_y = bar_top + bar_height / 2 -
-        icon_layer->bounds().height() / 2;
+    float icon_y = (bar_content_height_ - icon_layer->bounds().height()) / 2;
 
     icon_layer->SetPosition(gfx::PointF(icon_x, icon_y));
   }
 
   // ---------------------------------------------------------------------------
   // Close Icon
   // ---------------------------------------------------------------------------
   // Grab the Close Icon resource.
   ui::Resource* close_icon_resource = resource_manager_->GetResource(
       ui::ANDROID_RESOURCE_TYPE_STATIC, close_icon_resource_id_);
 
   // Positions the icon at the end of the bar.
   float close_icon_left;
   if (is_rtl) {
     close_icon_left = bar_margin_side;
   } else {
     close_icon_left =
         panel_width - close_icon_resource->size().width() - bar_margin_side;
   }
 
   // Centers the Close Icon vertically in the bar.
   float close_icon_top =
-      bar_top + bar_height / 2 - close_icon_resource->size().height() / 2;
+      (bar_content_height_ - 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);
 
   // ---------------------------------------------------------------------------
   // Content
   // ---------------------------------------------------------------------------
@@ skipping 56 matching lines @@
     : resource_manager_(resource_manager),
       layer_(cc::Layer::Create()),
       panel_shadow_(cc::NinePatchLayer::Create()),
       bar_background_(cc::SolidColorLayer::Create()),
       bar_text_(cc::UIResourceLayer::Create()),
       bar_shadow_(cc::UIResourceLayer::Create()),
       panel_icon_(cc::UIResourceLayer::Create()),
       close_icon_(cc::UIResourceLayer::Create()),
       content_container_(cc::SolidColorLayer::Create()),
       text_container_(cc::Layer::Create()),
-      bar_border_(cc::SolidColorLayer::Create()) {
+      bar_border_(cc::SolidColorLayer::Create()),
+      bar_handle_(cc::UIResourceLayer::Create()),
+      bar_content_layer_(cc::UIResourceLayer::Create()) {
   layer_->SetMasksToBounds(false);
   layer_->SetIsDrawable(true);
 
   // Panel Shadow
   panel_shadow_->SetIsDrawable(true);
   panel_shadow_->SetFillCenter(false);
   layer_->AddChild(panel_shadow_);
 
   // Bar Background
   bar_background_->SetIsDrawable(true);
   bar_background_->SetBackgroundColor(kBarBackgroundColor);
   layer_->AddChild(bar_background_);
 
+  // Bar Handle
+  bar_handle_->SetIsDrawable(true);
+
+  // Bar Content Layer
+  bar_content_layer_->SetIsDrawable(true);
+  layer_->AddChild(bar_content_layer_);
+
   // Bar Text
   bar_text_->SetIsDrawable(true);
   AddBarTextLayer(bar_text_);
-  layer_->AddChild(text_container_);
+  bar_content_layer_->AddChild(text_container_);
 
   // Panel Icon
   panel_icon_->SetIsDrawable(true);
 
   // The container that any text in the bar will be added to.
   text_container_->SetIsDrawable(true);
 
   // Close Icon
   close_icon_->SetIsDrawable(true);
-  layer_->AddChild(close_icon_);
+  bar_content_layer_->AddChild(close_icon_);
 
   // Content Container
   content_container_->SetIsDrawable(true);
   content_container_->SetBackgroundColor(kBarBackgroundColor);
   layer_->AddChild(content_container_);
 
   // Bar Border
   bar_border_->SetIsDrawable(true);
   bar_border_->SetBackgroundColor(kBarBorderColor);
 
   // Bar Shadow
   bar_shadow_->SetIsDrawable(true);
 }
 
 OverlayPanelLayer::~OverlayPanelLayer() {
 }
 
 scoped_refptr<cc::Layer> OverlayPanelLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android