Add a proper shadow to the experimental app list search box.

ui/app_list/views/search_box_view.cc

 // Copyright (c) 2012 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 "ui/app_list/views/search_box_view.h"
 
 #include <algorithm>
 
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_model.h"
 #include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/speech_ui_model.h"
 #include "ui/app_list/views/app_list_menu_views.h"
 #include "ui/app_list/views/search_box_view_delegate.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
+#include "ui/views/shadow_border.h"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 14;
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 
 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
 
 // Menu offset relative to the bottom-right corner of the menu button.
 const int kMenuYOffsetFromButton = -4;
 const int kMenuXOffsetFromButton = -7;
 
-const int kBackgroundBorderWidth = 1;
-const int kBackgroundBorderBottomWidth = 1;
 const int kBackgroundBorderCornerRadius = 2;
-const SkColor kBackgroundBorderColor = SkColorSetRGB(0xEE, 0xEE, 0xEE);
-const SkColor kBackgroundBorderBottomColor = SkColorSetRGB(0xCC, 0xCC, 0xCC);
+
+const int kShadowBlur = 4;
+const int kShadowYOffset = 2;
+const SkColor kShadowColor = SkColorSetARGB(0x33, 0, 0, 0);
 
 // A background that paints a solid white rounded rect with a thin grey border.
 class ExperimentalSearchBoxBackground : public views::Background {
  public:
   ExperimentalSearchBoxBackground() {}
   ~ExperimentalSearchBoxBackground() override {}
 
  private:
   // views::Background overrides:
   void Paint(gfx::Canvas* canvas, views::View* view) const override {
     gfx::Rect bounds = view->GetContentsBounds();
 
     SkPaint paint;
     paint.setFlags(SkPaint::kAntiAlias_Flag);
-    paint.setColor(kBackgroundBorderColor);
-    canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
-    bounds.Inset(kBackgroundBorderWidth,
-                 kBackgroundBorderWidth,
-                 kBackgroundBorderWidth,
-                 0);
-    paint.setColor(kBackgroundBorderBottomColor);
-    canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
-    bounds.Inset(0, 0, 0, kBackgroundBorderBottomWidth);
     paint.setColor(kSearchBoxBackground);
     canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
   }
 
   DISALLOW_COPY_AND_ASSIGN(ExperimentalSearchBoxBackground);
 };
 
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
+      content_container_(new views::View),
       icon_view_(NULL),
       back_button_(NULL),
       speech_button_(NULL),
       menu_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
+  SetLayoutManager(new views::FillLayout());
+  AddChildView(content_container_);
+
   if (switches::IsExperimentalAppListEnabled()) {
+    SetBorder(make_scoped_ptr(
+        new views::ShadowBorder(kShadowBlur, kShadowColor, kShadowYOffset, 0)));
     back_button_ = new views::ImageButton(this);
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     back_button_->SetImage(
         views::ImageButton::STATE_NORMAL,
         rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
     back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
                                     views::ImageButton::ALIGN_MIDDLE);
-    AddChildView(back_button_);
+    content_container_->AddChildView(back_button_);
 
-    set_background(new ExperimentalSearchBoxBackground());
+    content_container_->set_background(new ExperimentalSearchBoxBackground());
   } else {
     set_background(
         views::Background::CreateSolidBackground(kSearchBoxBackground));
     SetBorder(
         views::Border::CreateSolidSidedBorder(0, 0, 1, 0, kTopSeparatorColor));
     icon_view_ = new views::ImageView;
-    AddChildView(icon_view_);
+    content_container_->AddChildView(icon_view_);
   }
 
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal,
                            kPadding,
                            0,
                            kPadding - views::Textfield::kTextPadding);
-  SetLayoutManager(layout);
+  content_container_->SetLayoutManager(layout);
   layout->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   layout->set_minimum_cross_axis_size(kPreferredHeight);
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
   search_box_->SetBorder(views::Border::NullBorder());
   search_box_->SetFontList(rb.GetFontList(ui::ResourceBundle::MediumFont));
   search_box_->set_placeholder_text_color(kHintTextColor);
   search_box_->set_controller(this);
-  AddChildView(search_box_);
+  content_container_->AddChildView(search_box_);
   layout->SetFlexForView(search_box_, 1);
 
 #if !defined(OS_CHROMEOS)
   menu_button_ = new views::MenuButton(NULL, base::string16(), this, false);
   menu_button_->SetBorder(views::Border::NullBorder());
   menu_button_->SetImage(views::Button::STATE_NORMAL,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_NORMAL));
   menu_button_->SetImage(views::Button::STATE_HOVERED,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_HOVER));
   menu_button_->SetImage(views::Button::STATE_PRESSED,
                          *rb.GetImageSkiaNamed(IDR_APP_LIST_TOOLS_PRESSED));
-  AddChildView(menu_button_);
+  content_container_->AddChildView(menu_button_);
 #endif
 
   view_delegate_->GetSpeechUI()->AddObserver(this);
   ModelChanged();
 }
 
 SearchBoxView::~SearchBoxView() {
   view_delegate_->GetSpeechUI()->RemoveObserver(this);
   model_->search_box()->RemoveObserver(this);
 }
@@ skipping 20 matching lines @@
   // Updates model and fires query changed manually because SetText() above
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
 }
 
 void SearchBoxView::InvalidateMenu() {
   menu_.reset();
 }
 
+gfx::Rect SearchBoxView::GetViewBoundsForSearchBoxContentsBounds(
+    const gfx::Rect& rect) {
+  gfx::Rect view_bounds = rect;
+  view_bounds.Inset(GetInsets().Scale(-1));
+  return view_bounds;
+}
+
 gfx::Size SearchBoxView::GetPreferredSize() const {
   return gfx::Size(kPreferredWidth, kPreferredHeight);
 }
 
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
 
   return false;
 }
@@ skipping 66 matching lines @@
   if (icon_view_)
     icon_view_->SetImage(model_->search_box()->icon());
 }
 
 void SearchBoxView::SpeechRecognitionButtonPropChanged() {
   const SearchBoxModel::SpeechButtonProperty* speech_button_prop =
       model_->search_box()->speech_button();
   if (speech_button_prop) {
     if (!speech_button_) {
       speech_button_ = new views::ImageButton(this);
-      AddChildView(speech_button_);
+      content_container_->AddChildView(speech_button_);
     }
 
     if (view_delegate_->GetSpeechUI()->state() ==
         SPEECH_RECOGNITION_HOTWORD_LISTENING) {
       speech_button_->SetImage(
           views::Button::STATE_NORMAL, &speech_button_prop->on_icon);
       speech_button_->SetTooltipText(speech_button_prop->on_tooltip);
     } else {
       speech_button_->SetImage(
           views::Button::STATE_NORMAL, &speech_button_prop->off_icon);
@@ skipping 22 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list