[Contextual Search] Fix Promo behavior.

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 128 matching lines @@
   search_icon_->SetOpacity(search_icon_opacity);
 
   // ---------------------------------------------------------------------------
   // 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
+      // Search Bar Shadow to make sure it won't occlude the shadow.
+      layer_->InsertChild(search_promo_container_, 0);
+    }
 
     if (search_promo_resource) {
-      // Search Promo Container
-      if (search_promo_container_->parent() != layer_)
-        layer_->AddChild(search_promo_container_);
-
       int search_promo_content_height = search_promo_resource->size.height();
       gfx::Size search_promo_size(search_panel_width, search_promo_height);
       search_promo_container_->SetBounds(search_promo_size);
       search_promo_container_->SetPosition(gfx::PointF(0.f, search_bar_height));
       search_promo_container_->SetMasksToBounds(true);
 
       // Search Promo
       if (search_promo_->parent() != search_promo_container_)
         search_promo_container_->AddChild(search_promo_);
 
       search_promo_->SetUIResourceId(search_promo_resource->ui_resource->id());
       search_promo_->SetBounds(search_promo_resource->size);
       // Align promo at the bottom of the container so the confirmation button
       // is is not clipped when resizing the promo.
       search_promo_->SetPosition(
           gfx::PointF(0.f, search_promo_height - search_promo_content_height));
       search_promo_->SetOpacity(search_promo_opacity);
     }
   } else {
-    // TODO(pedrosimonetti): confirm with dtrainor@ that we don't need to remove
-    // the child too (since it's going to be removed when the parent is gone).
-
     // Search Promo Container
     if (search_promo_container_.get() && search_promo_container_->parent())
       search_promo_container_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Search Content View
   // ---------------------------------------------------------------------------
   content_view_container_->SetPosition(
       gfx::PointF(0.f, search_bar_height + search_promo_height));
   if (content_view_core && content_view_core->GetLayer().get()) {
     scoped_refptr<cc::Layer> content_view_layer = content_view_core->GetLayer();
     if (content_view_layer->parent() != content_view_container_)
       content_view_container_->AddChild(content_view_layer);
   } else {
     content_view_container_->RemoveAllChildren();
   }
 
   // ---------------------------------------------------------------------------
   // Search Bar Shadow
   // ---------------------------------------------------------------------------
   if (search_bar_shadow_visible) {
     ui::ResourceManager::Resource* search_bar_shadow_resource =
         resource_manager_->GetResource(ui::ANDROID_RESOURCE_TYPE_STATIC,
                                        search_bar_shadow_resource_id);
 
     if (search_bar_shadow_resource) {
       if (search_bar_shadow_->parent() != layer_)
         layer_->AddChild(search_bar_shadow_);
+
+      int shadow_height = search_bar_shadow_resource->size.height();
+      gfx::Size shadow_size(search_panel_width, shadow_height);
+
+      search_bar_shadow_->SetUIResourceId(
+          search_bar_shadow_resource->ui_resource->id());
+      search_bar_shadow_->SetBounds(shadow_size);
+      search_bar_shadow_->SetPosition(gfx::PointF(0.f, search_bar_height));
+      search_bar_shadow_->SetOpacity(search_bar_shadow_opacity);
     }
-
-    int shadow_height = search_bar_shadow_resource->size.height();
-    gfx::Size shadow_size(search_panel_width, shadow_height);
-
-    search_bar_shadow_->SetUIResourceId(
-        search_bar_shadow_resource->ui_resource->id());
-    search_bar_shadow_->SetBounds(shadow_size);
-    search_bar_shadow_->SetPosition(gfx::PointF(0.f, search_bar_height));
-    search_bar_shadow_->SetOpacity(search_bar_shadow_opacity);
   } else {
     if (search_bar_shadow_.get() && search_bar_shadow_->parent())
       search_bar_shadow_->RemoveFromParent();
   }
 
   // ---------------------------------------------------------------------------
   // Search Panel.
   // ---------------------------------------------------------------------------
   layer_->SetPosition(gfx::PointF(0.f, search_panel_y));
 
@@ skipping 127 matching lines @@
 
 ContextualSearchLayer::~ContextualSearchLayer() {
 }
 
 scoped_refptr<cc::Layer> ContextualSearchLayer::layer() {
   return layer_;
 }
 
 }  //  namespace android
 }  //  namespace chrome