Move composited toolbar to bottom of screen when Chrome Home is enabled

chrome/browser/android/compositor/layer/toolbar_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/toolbar_layer.h"
 
+#include "base/feature_list.h"
 #include "cc/layers/nine_patch_layer.h"
 #include "cc/layers/solid_color_layer.h"
 #include "cc/layers/ui_resource_layer.h"
 #include "cc/resources/scoped_ui_resource.h"
+#include "chrome/browser/android/chrome_feature_list.h"
 #include "content/public/browser/android/compositor.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/android/resources/resource_manager.h"
 
 namespace android {
 
 // static
 scoped_refptr<ToolbarLayer> ToolbarLayer::Create(
     ui::ResourceManager* resource_manager) {
   return make_scoped_refptr(new ToolbarLayer(resource_manager));
 }
 
 scoped_refptr<cc::Layer> ToolbarLayer::layer() {
   return layer_;
 }
 
 void ToolbarLayer::PushResource(
     int toolbar_resource_id,
     int toolbar_background_color,
     bool anonymize,
     int toolbar_textbox_background_color,
     int url_bar_background_resource_id,
     float url_bar_alpha,
+    float view_height,
     bool show_debug,
     bool clip_shadow) {
   ui::ResourceManager::Resource* resource =
       resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_DYNAMIC,
                                      toolbar_resource_id);
 
   // Ensure the toolbar resource is available before making the layer visible.
   layer_->SetHideLayerAndSubtree(!resource);
   if (!resource)
     return;
 
   // This layer effectively draws over the space it takes for shadows.  Set the
   // bounds to the non-shadow size so that other things can properly line up.
   // Padding height does not include the height of the tabstrip, so we add
   // it explicitly by adding y offset.
   gfx::Size size = gfx::Size(
       resource->padding.width(),
       resource->padding.height() + resource->padding.y());
   layer_->SetBounds(size);
 
+  // The toolbar_root_ contains all of the layers that make up the toolbar. The
+  // toolbar_root_ is moved around inside of layer_ to allow appropriate
+  // clipping of the shadow.
+  toolbar_root_->SetBounds(resource->padding.size());
+
+  gfx::PointF background_position(resource->padding.origin());
+  if (is_chrome_home_enabled_) {
+    float layer_offset =
+        resource->size.height() - resource->padding.size().height();
+    layer_->SetPosition(gfx::PointF(0, view_height));
+    toolbar_root_->SetPosition(gfx::PointF(0, -layer_offset));
+    background_position.set_y(layer_offset);
+  }
+
   toolbar_background_layer_->SetBounds(resource->padding.size());
-  toolbar_background_layer_->SetPosition(
-      gfx::PointF(resource->padding.origin()));
+  toolbar_background_layer_->SetPosition(background_position);
   toolbar_background_layer_->SetBackgroundColor(toolbar_background_color);
 
   bool url_bar_visible = (resource->aperture.width() != 0);
   url_bar_background_layer_->SetHideLayerAndSubtree(!url_bar_visible);
   if (url_bar_visible) {
     ui::ResourceManager::Resource* url_bar_background_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                        url_bar_background_resource_id);
     gfx::Size url_bar_size(
         resource->aperture.width() + url_bar_background_resource->size.width()
@@ skipping 64 matching lines @@
   if (is_progress_bar_visible) {
     progress_bar_layer_->SetPosition(
         gfx::PointF(progress_bar_x, progress_bar_y));
     progress_bar_layer_->SetBounds(
         gfx::Size(progress_bar_width, progress_bar_height));
     progress_bar_layer_->SetBackgroundColor(progress_bar_color);
   }
 }
 
 ToolbarLayer::ToolbarLayer(ui::ResourceManager* resource_manager)
-    : resource_manager_(resource_manager),
+    : is_chrome_home_enabled_(
+          base::FeatureList::IsEnabled(chrome::android::kChromeHomeFeature)),
+      resource_manager_(resource_manager),
       layer_(cc::Layer::Create()),
+      toolbar_root_(cc::Layer::Create()),
       toolbar_background_layer_(cc::SolidColorLayer::Create()),
       url_bar_background_layer_(cc::NinePatchLayer::Create()),
       bitmap_layer_(cc::UIResourceLayer::Create()),
       progress_bar_layer_(cc::SolidColorLayer::Create()),
       progress_bar_background_layer_(cc::SolidColorLayer::Create()),
       anonymize_layer_(cc::SolidColorLayer::Create()),
       debug_layer_(cc::SolidColorLayer::Create()) {
+  layer_->AddChild(toolbar_root_);
+
   toolbar_background_layer_->SetIsDrawable(true);
-  layer_->AddChild(toolbar_background_layer_);
+  toolbar_root_->AddChild(toolbar_background_layer_);
 
   url_bar_background_layer_->SetIsDrawable(true);
   url_bar_background_layer_->SetFillCenter(true);
-  layer_->AddChild(url_bar_background_layer_);
+  toolbar_root_->AddChild(url_bar_background_layer_);
 
   bitmap_layer_->SetIsDrawable(true);
-  layer_->AddChild(bitmap_layer_);
+  toolbar_root_->AddChild(bitmap_layer_);
 
   progress_bar_background_layer_->SetIsDrawable(true);
   progress_bar_background_layer_->SetHideLayerAndSubtree(true);
-  layer_->AddChild(progress_bar_background_layer_);
+  toolbar_root_->AddChild(progress_bar_background_layer_);
 
   progress_bar_layer_->SetIsDrawable(true);
   progress_bar_layer_->SetHideLayerAndSubtree(true);
-  layer_->AddChild(progress_bar_layer_);
+  toolbar_root_->AddChild(progress_bar_layer_);
 
   anonymize_layer_->SetIsDrawable(true);
   anonymize_layer_->SetBackgroundColor(SK_ColorWHITE);
-  layer_->AddChild(anonymize_layer_);
+  toolbar_root_->AddChild(anonymize_layer_);
 
   debug_layer_->SetIsDrawable(true);
   debug_layer_->SetBackgroundColor(SK_ColorGREEN);
   debug_layer_->SetOpacity(0.5f);
 }
 
 ToolbarLayer::~ToolbarLayer() {
 }
 
 }  //  namespace android