app_list: Add search box and search result view for v2.

ui/app_list/app_list_bubble_border.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/app_list_bubble_border.h"
 
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/effects/SkBlurDrawLooper.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
+#include "ui/app_list/view_ids.h"
 #include "ui/gfx/canvas.h"
 
 namespace {
 
 // Bubble border corner radius.
 const int kCornerRadius = 3;
 
 // Arrow width and height.
 const int kArrowHeight = 10;
 const int kArrowWidth = 20;
 
 // Bubble border color and width.
 const SkColor kBorderColor = SkColorSetARGB(0xFF, 0, 0, 0);
 const int kBorderSize = 1;
 
 // Bubble shadow color and radius.
 const SkColor kShadowColor = SkColorSetARGB(0xFF, 0, 0, 0);
 const int kShadowRadius = 4;
 
+const SkColor kSearchBoxBackground = SK_ColorWHITE;
+
 // Colors and sizes of top separator between searchbox and grid view.
 const SkColor kTopSeparatorColor = SkColorSetRGB(0xDB, 0xDB, 0xDB);
 const int kTopSeparatorSize = 1;
 const SkColor kTopSeparatorGradientColor1 = SkColorSetRGB(0xEF, 0xEF, 0xEF);
 const SkColor kTopSeparatorGradientColor2 = SkColorSetRGB(0xF9, 0xF9, 0xF9);
 const int kTopSeparatorGradientSize = 9;
 
 // Colors and sizes of bottom separator bwtween grid view and page switcher.
 const SkColor kFooterBorderGradientColor1 = SkColorSetRGB(0x9F, 0x9F, 0x9F);
 const SkColor kFooterBorderGradientColor2 = SkColorSetRGB(0xD9, 0xD9, 0xD9);
@@ skipping 56 matching lines @@
 AppListBubbleBorder::AppListBubbleBorder(views::View* app_list_view)
     : views::BubbleBorder(views::BubbleBorder::BOTTOM_RIGHT,
                           views::BubbleBorder::NO_SHADOW),
       app_list_view_(app_list_view),
       arrow_offset_(0) {
 }
 
 AppListBubbleBorder::~AppListBubbleBorder() {
 }
 
-void AppListBubbleBorder::PaintModelViewBackground(
+void AppListBubbleBorder::PaintSearchBoxBackground(
     gfx::Canvas* canvas,
     const gfx::Rect& bounds) const {
-  const views::View* page_switcher = app_list_view_->child_at(1);
-  const gfx::Rect page_switcher_bounds =
-      app_list_view_->ConvertRectToWidget(page_switcher->bounds());
+  const views::View* search_box_view =
+      app_list_view_->GetViewByID(VIEW_ID_SEARCH_BOX);
+  const gfx::Rect search_box_view_bounds =
+      app_list_view_->ConvertRectToWidget(search_box_view->bounds());
   gfx::Rect rect(bounds.x(),
                  bounds.y(),
                  bounds.width(),
-                 page_switcher_bounds.y() - bounds.y());
-
-  // TODO(xiyuan): Draw 1px separator line after SearchBoxView is added.
+                 search_box_view_bounds.bottom() - bounds.y());
 
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
+  paint.setColor(kSearchBoxBackground);
+  canvas->DrawRect(rect, paint);
+
+  gfx::Rect seperator_rect(rect);
+  seperator_rect.set_y(seperator_rect.bottom());
+  seperator_rect.set_height(kTopSeparatorSize);
+  canvas->FillRect(seperator_rect, kTopSeparatorColor);
+}
+
+void AppListBubbleBorder::PaintSearchResultListBackground(
+    gfx::Canvas* canvas,
+    const gfx::Rect& bounds) const {
+  const views::View* results_view =
+      app_list_view_->GetViewByID(VIEW_ID_SEARCH_RESULTS);
+  if (!results_view->visible())
+    return;
+
+  const views::View* search_box_view =
+      app_list_view_->GetViewByID(VIEW_ID_SEARCH_BOX);
+  const gfx::Rect search_box_view_bounds =
+      app_list_view_->ConvertRectToWidget(search_box_view->bounds());
+  int start_y = search_box_view_bounds.bottom() + kTopSeparatorSize;
+  gfx::Rect rect(bounds.x(),
+                 start_y,
+                 bounds.width(),
+                 bounds.bottom() - start_y + kArrowHeight);
+
+  SkPaint paint;
+  paint.setStyle(SkPaint::kFill_Style);
+  paint.setColor(kSearchBoxBackground);
+  canvas->DrawRect(rect, paint);
+}
+
+void AppListBubbleBorder::PaintAppsGridBackground(
+    gfx::Canvas* canvas,
+    const gfx::Rect& bounds) const {
+  const views::View* grid =
+      app_list_view_->GetViewByID(VIEW_ID_APPS_GRID);
+  if (!grid->visible())
+    return;
+
+  const views::View* search_box_view =
+      app_list_view_->GetViewByID(VIEW_ID_SEARCH_BOX);
+  const gfx::Rect search_box_view_bounds =
+      app_list_view_->ConvertRectToWidget(search_box_view->bounds());
+  const views::View* page_switcher =
+      app_list_view_->GetViewByID(VIEW_ID_PAGE_SWITCHER);
+  const gfx::Rect page_switcher_bounds =
+      app_list_view_->ConvertRectToWidget(page_switcher->bounds());
+  int start_y = search_box_view_bounds.bottom() + kTopSeparatorSize;
+  gfx::Rect rect(bounds.x(),
+                 start_y,
+                 bounds.width(),
+                 page_switcher_bounds.y() - start_y);
+
+  SkPaint paint;
+  paint.setStyle(SkPaint::kFill_Style);
   SkSafeUnref(paint.setShader(CreateVerticalGradientShader(
       rect.y(),
       rect.y() + kTopSeparatorGradientSize,
       kTopSeparatorGradientColor1,
       kTopSeparatorGradientColor2,
       SkShader::kClamp_TileMode)));
   canvas->DrawRect(rect, paint);
 }
 
 void AppListBubbleBorder::PaintPageSwitcherBackground(
     gfx::Canvas* canvas,
     const gfx::Rect& bounds) const {
-  const views::View* page_switcher = app_list_view_->child_at(1);
+  const views::View* page_switcher =
+      app_list_view_->GetViewByID(VIEW_ID_PAGE_SWITCHER);
+  if (!page_switcher->visible())
+    return;
+
   const gfx::Rect page_switcher_bounds =
       app_list_view_->ConvertRectToWidget(page_switcher->bounds());
 
   gfx::Rect rect(bounds.x(),
                  page_switcher_bounds.y(),
                  bounds.width(),
                  kFooterBorderSize);
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   SkSafeUnref(paint.setShader(CreateVerticalGradientShader(
@@ skipping 61 matching lines @@
   canvas->DrawPath(path, paint);
 
   // Pads with kBoprderSize pixels to leave space for border lines.
   BuildShape(bounds,
              SkIntToScalar(kBorderSize),
              SkIntToScalar(arrow_offset_),
              &path);
   canvas->Save();
   canvas->ClipPath(path);
 
-  PaintModelViewBackground(canvas, bounds);
+  PaintSearchBoxBackground(canvas, bounds);
+  PaintAppsGridBackground(canvas, bounds);
   PaintPageSwitcherBackground(canvas, bounds);
+  PaintSearchResultListBackground(canvas, bounds);
 
   canvas->Restore();
 }
 
 }  // namespace app_list