Chromium Code Reviews| Index: ui/app_list/app_list_bubble_border.cc |
| diff --git a/ui/app_list/app_list_bubble_border.cc b/ui/app_list/app_list_bubble_border.cc |
| index 5575f84980f064b41d07fd12dfceb4cabff3e1d2..ea0459d916f7a19d97b5aac99a1a388a3c244ef9 100644 |
| --- a/ui/app_list/app_list_bubble_border.cc |
| +++ b/ui/app_list/app_list_bubble_border.cc |
| @@ -34,8 +34,17 @@ AppListBubbleBorder::AppListBubbleBorder(views::View* app_list_view, |
| AppListBubbleBorder::~AppListBubbleBorder() { |
| } |
| +// static |
| +SkColor AppListBubbleBorder::ContentsBackgroundColor() { |
| + return kContentsBackground; |
| +} |
| + |
| void AppListBubbleBorder::PaintBackground(gfx::Canvas* canvas, |
| const gfx::Rect& bounds) const { |
| + SkPaint paint; |
| + paint.setStyle(SkPaint::kFill_Style); |
| + |
| +#if !defined(OS_WIN) |
|
xiyuan
2012/08/29 17:39:15
Could you confirm that app list looks different on
benwells
2012/08/30 06:51:30
Nothing drawn here is shown on Windows, except for
xiyuan
2012/08/30 16:50:51
There are padding pixels (controlled by BubbleDele
|
| const gfx::Rect search_box_view_bounds = |
| app_list_view_->ConvertRectToWidget(search_box_view_->bounds()); |
| gfx::Rect search_box_rect(bounds.x(), |
| @@ -43,8 +52,6 @@ void AppListBubbleBorder::PaintBackground(gfx::Canvas* canvas, |
| bounds.width(), |
| search_box_view_bounds.bottom() - bounds.y()); |
| - SkPaint paint; |
| - paint.setStyle(SkPaint::kFill_Style); |
| paint.setColor(kSearchBoxBackground); |
| canvas->DrawRect(search_box_rect, paint); |
| @@ -57,6 +64,12 @@ void AppListBubbleBorder::PaintBackground(gfx::Canvas* canvas, |
| seperator_rect.bottom(), |
| bounds.width(), |
| bounds.bottom() - seperator_rect.bottom()); |
| +#else |
| + gfx::Rect contents_rect(bounds.x(), |
|
msw
2012/08/29 08:02:35
nit: use copy ctor.
benwells
2012/08/30 06:51:30
Done.
|
| + bounds.y(), |
| + bounds.width(), |
| + bounds.height()); |
| +#endif |
| paint.setColor(kContentsBackground); |
| canvas->DrawRect(contents_rect, paint); |