Move app list search box into AppListView.

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"
@@ skipping 19 matching lines @@
 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);
 
 // A background that paints a solid white rounded rect with a thin grey border.
-class SearchBoxBackground : public views::Background {
+class ExperimentalSearchBoxBackground : public views::Background {
  public:
-  SearchBoxBackground() {}
-  virtual ~SearchBoxBackground() {}
+  ExperimentalSearchBoxBackground() {}
+  virtual ~ExperimentalSearchBoxBackground() {}
 
  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(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(SK_ColorWHITE);
+    paint.setColor(kSearchBoxBackground);
     canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, paint);
   }
 
-  DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
+  DISALLOW_COPY_AND_ASSIGN(ExperimentalSearchBoxBackground);
 };
 
 }  // namespace
 
 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
                              AppListViewDelegate* view_delegate)
     : delegate_(delegate),
       view_delegate_(view_delegate),
       model_(NULL),
       icon_view_(NULL),
       speech_button_(NULL),
       search_box_(new views::Textfield),
       contents_view_(NULL) {
   if (switches::IsExperimentalAppListEnabled()) {
-    set_background(new SearchBoxBackground());
+    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_);
   }
 
   views::BoxLayout* layout =
       new views::BoxLayout(views::BoxLayout::kHorizontal,
                            kPadding,
                            0,
                            kPadding - views::Textfield::kTextPadding);
   SetLayoutManager(layout);
@@ skipping 162 matching lines @@
   NotifyQueryChanged();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list