app_list: Add transition for apps grid and search results.

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/SkGradientShader.h"
 #include "ui/gfx/canvas.h"
@@ skipping 100 matching lines @@
   }
 
   path->close();
 }
 
 }  // namespace
 
 namespace app_list {
 
 AppListBubbleBorder::AppListBubbleBorder(views::View* app_list_view,
-                                         views::View* search_box_view,
-                                         views::View* grid_view,
-                                         views::View* results_view)
+                                         views::View* search_box_view)
     : views::BubbleBorder(views::BubbleBorder::BOTTOM_RIGHT,
                           views::BubbleBorder::NO_SHADOW),
       app_list_view_(app_list_view),
-      search_box_view_(search_box_view),
-      grid_view_(grid_view),
-      results_view_(results_view) {
+      search_box_view_(search_box_view) {
   const gfx::ShadowValue kShadows[] = {
     // Offset (0, 5), blur=8, color=0.36 black
-    gfx::ShadowValue(gfx::Point(0, 5), 8, SkColorSetARGB(0x5B, 0, 0, 0)),
+    gfx::ShadowValue(gfx::Point(0, 5), 30, SkColorSetARGB(0x72, 0, 0, 0)),
   };
   shadows_.assign(kShadows, kShadows + arraysize(kShadows));
 }
 
 AppListBubbleBorder::~AppListBubbleBorder() {
 }
 
 bool AppListBubbleBorder::ArrowAtTopOrBottom() const {
   return arrow_location() == views::BubbleBorder::TOP_LEFT ||
       arrow_location() == views::BubbleBorder::TOP_RIGHT ||
@@ skipping 16 matching lines @@
     return -offset_.x();
   } else if (ArrowOnLeftOrRight()) {
     // Picks y offset and moves bubble arrow in the opposite direction.
     return -offset_.y();
   }
 
   // Other style does not have an arrow, so return 0.
   return 0;
 }
 
-void AppListBubbleBorder::PaintSearchBoxBackground(
-    gfx::Canvas* canvas,
-    const gfx::Rect& bounds) const {
+void AppListBubbleBorder::PaintBackground(gfx::Canvas* canvas,
+                                          const gfx::Rect& bounds) const {
   const gfx::Rect search_box_view_bounds =
       app_list_view_->ConvertRectToWidget(search_box_view_->bounds());
-  gfx::Rect rect(bounds.x(),
-                 bounds.y(),
-                 bounds.width(),
-                 search_box_view_bounds.bottom() - bounds.y());
+  gfx::Rect search_box_rect(bounds.x(),
+                            bounds.y(),
+                            bounds.width(),
+                            search_box_view_bounds.bottom() - bounds.y());
 
   SkPaint paint;
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(kSearchBoxBackground);
-  canvas->DrawRect(rect, paint);
+  canvas->DrawRect(search_box_rect, paint);
 
-  gfx::Rect seperator_rect(rect);
+  gfx::Rect seperator_rect(search_box_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 {
-  if (!results_view_->visible())
-    return;
+  gfx::Rect contents_rect(bounds.x(),
+                          seperator_rect.bottom(),
+                          bounds.width(),
+                          bounds.bottom() - seperator_rect.bottom());
 
-  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);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(kContentsBackground);
-  canvas->DrawRect(rect, paint);
-}
-
-void AppListBubbleBorder::PaintAppsGridBackground(
-    gfx::Canvas* canvas,
-    const gfx::Rect& bounds) const {
-  if (!grid_view_->visible())
-    return;
-
-  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);
-
-  SkPaint paint;
-  paint.setStyle(SkPaint::kFill_Style);
-  paint.setColor(kContentsBackground);
-  canvas->DrawRect(rect, paint);
+  canvas->DrawRect(contents_rect, paint);
 }
 
 void AppListBubbleBorder::GetInsets(gfx::Insets* insets) const {
   // Negate to change from outer margin to inner padding.
   gfx::Insets shadow_padding(-gfx::ShadowValue::GetMargin(shadows_));
 
   if (arrow_location() == views::BubbleBorder::TOP_LEFT ||
       arrow_location() == views::BubbleBorder::TOP_RIGHT) {
     // Arrow at top.
     insets->Set(shadow_padding.top() + kArrowHeight,
@@ skipping 119 matching lines @@
   BuildShape(content_bounds,
              arrow_location(),
              SkIntToScalar(GetArrowOffset()),
              SkIntToScalar(kBorderSize),
              &path);
   canvas->Save();
   canvas->ClipPath(path);
 
   // Use full bounds so that arrow is also painted.
   const gfx::Rect& bounds = view.bounds();
-  PaintSearchBoxBackground(canvas, bounds);
-  PaintAppsGridBackground(canvas, bounds);
-  PaintSearchResultListBackground(canvas, bounds);
+  PaintBackground(canvas, bounds);
 
   canvas->Restore();
 }
 
 }  // namespace app_list