Use a background for the main search box in the experimental app list.

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_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"
 
 namespace app_list {
 
 namespace {
 
 const int kPadding = 14;
 const int kIconDimension = 32;
 const int kPreferredWidth = 360;
 const int kPreferredHeight = 48;
 #if !defined(OS_CHROMEOS)
 const int kMenuButtonDimension = 29;
 #endif
 
 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;
 
+// Experimental app list constants.
+const int kExperimentalSearchBoxHeight = 37;
+
+const int kExperimentalBorderWidth = 1;
+const int kExperimentalBorderBottomWidth = 2;
+const int kExperimentalBorderCornerRadius = 2;
+const SkColor kExperimentalBorderColor = SkColorSetRGB(0xEE, 0xEE, 0xEE);
+
+// A background that paints a solid white rounded rect with a thin grey border.
+class ExperimentalBackground : public views::Background {

[Matt Giuca, 2014/08/25 05:15:25]

Same here: Call this BorderedBackground or similar.

(Feel free to say in the comments "used by the experimental app list.")

[calamity, 2014/08/26 01:16:30]

Done. I don't think the comment will be necessary..

+ public:
+  ExperimentalBackground() {}
+  virtual ~ExperimentalBackground() {}
+
+ private:
+  // views::Background overrides:
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE {
+    gfx::Rect bounds = view->GetContentsBounds();
+
+    SkPaint paint;
+    paint.setFlags(SkPaint::kAntiAlias_Flag);
+    paint.setColor(kExperimentalBorderColor);
+    canvas->DrawRoundRect(bounds, kExperimentalBorderCornerRadius, paint);
+    bounds.Inset(kExperimentalBorderWidth,
+                 kExperimentalBorderWidth,
+                 kExperimentalBorderWidth,
+                 kExperimentalBorderBottomWidth);
+    paint.setColor(SK_ColorWHITE);
+    canvas->DrawRoundRect(bounds, kExperimentalBorderCornerRadius, paint);
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(ExperimentalBackground);
+};
+
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       icon_view_(new views::ImageView),
       speech_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
   AddChildView(icon_view_);
+  if (switches::IsExperimentalAppListEnabled())
+    set_background(new ExperimentalBackground());
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
 #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));
@@ skipping 40 matching lines @@
   // does not generate ContentsChanged() notification.
   UpdateModel();
   NotifyQueryChanged();
 }
 
 void SearchBoxView::InvalidateMenu() {
   menu_.reset();
 }
 
 gfx::Size SearchBoxView::GetPreferredSize() const {
-  return gfx::Size(kPreferredWidth, kPreferredHeight);
+  return gfx::Size(kPreferredWidth,
+                   switches::IsExperimentalAppListEnabled()
+                       ? kExperimentalSearchBoxHeight
+                       : kPreferredHeight);
 }
 
 void SearchBoxView::Layout() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect icon_frame(rect);
   icon_frame.set_width(kIconDimension + 2 * kPadding);
   icon_view_->SetBoundsRect(icon_frame);
@@ skipping 130 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list