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

ui/app_list/views/start_page_view.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 "ui/app_list/views/start_page_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 18 matching lines @@
 // Layout constants.
 const int kTopMargin = 30;
 const int kInstantContainerSpacing = 20;
 
 // WebView constants.
 const int kWebViewWidth = 500;
 const int kWebViewHeight = 105;
 
 // DummySearchBoxView constants.
 const int kDummySearchBoxWidth = 490;
-const int kDummySearchBoxHeight = 40;
-const int kDummySearchBoxBorderWidth = 1;
-const int kDummySearchBoxBorderBottomWidth = 2;
-const int kDummySearchBoxBorderCornerRadius = 2;
 
 // Tile container constants.
 const size_t kNumStartPageTiles = 5;
 const int kTileSpacing = 10;
 
-// A background that paints a solid white rounded rect with a thin grey border.
-class DummySearchBoxBackground : public views::Background {
- public:
-  DummySearchBoxBackground() {}
-  virtual ~DummySearchBoxBackground() {}
-
- 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(kStartPageBorderColor);
-    canvas->DrawRoundRect(bounds, kDummySearchBoxBorderCornerRadius, paint);
-    bounds.Inset(kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderWidth,
-                 kDummySearchBoxBorderBottomWidth);
-    paint.setColor(SK_ColorWHITE);
-    canvas->DrawRoundRect(bounds, kDummySearchBoxBorderCornerRadius, paint);
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(DummySearchBoxBackground);
-};
-
 // A placeholder search box which is sized to fit within the start page view.
 class DummySearchBoxView : public SearchBoxView {
  public:
   DummySearchBoxView(SearchBoxViewDelegate* delegate,
                      AppListViewDelegate* view_delegate)
       : SearchBoxView(delegate, view_delegate) {
-    set_background(new DummySearchBoxBackground());
   }
 
   virtual ~DummySearchBoxView() {}
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() const OVERRIDE {
-    return gfx::Size(kDummySearchBoxWidth, kDummySearchBoxHeight);
+    gfx::Size size(SearchBoxView::GetPreferredSize());
+    size.set_width(kDummySearchBoxWidth);

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

Looks like there's literally just the width of the search box is the only
difference between DummySearchBoxView and its parent class.

I don't think it's worth having this as a subclass any more. Can we just
override the width using a parameter to SearchBoxView or something like that?

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

I _could_ but I'm planning to remove this completely and just use 1 search box
at some point. That will be necessary for the search box animation so I think we
can just leave it for now.

[Matt Giuca, 2014/08/26 02:45:33]

Acknowledged.

+    return size;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DummySearchBoxView);
 };
 
 }  // namespace
 
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
                              AppListViewDelegate* view_delegate)
@@ skipping 188 matching lines @@
 
 void StartPageView::ListItemMoved(size_t index, size_t target_index) {
   ScheduleUpdate();
 }
 
 void StartPageView::ListItemsChanged(size_t start, size_t count) {
   ScheduleUpdate();
 }
 
 }  // namespace app_list