| Index: ui/app_list/app_list_view.cc
|
| diff --git a/ui/app_list/app_list_view.cc b/ui/app_list/app_list_view.cc
|
| index d1c0b43f19dd974317d69977e5079aeddbb85b3d..2212c5103bc4f851aab0a189511cb298786f7c37 100644
|
| --- a/ui/app_list/app_list_view.cc
|
| +++ b/ui/app_list/app_list_view.cc
|
| @@ -51,8 +51,14 @@ void AppListView::InitAsBubble(
|
| gfx::NativeView parent,
|
| PaginationModel* pagination_model,
|
| views::View* anchor,
|
| + const gfx::Point& anchor_point,
|
| views::BubbleBorder::ArrowLocation arrow_location) {
|
| +#if defined(OS_WIN)
|
| + set_background(views::Background::CreateSolidBackground(
|
| + AppListBubbleBorder::ContentsBackgroundColor()));
|
| +#else
|
| set_background(NULL);
|
| +#endif
|
|
|
| SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical,
|
| kInnerPadding,
|
| @@ -68,6 +74,7 @@ void AppListView::InitAsBubble(
|
| search_box_view_->set_contents_view(contents_view_);
|
|
|
| set_anchor_view(anchor);
|
| + set_anchor_point(anchor_point);
|
| set_margins(gfx::Insets());
|
| set_move_with_anchor(true);
|
| set_parent_window(parent);
|
| @@ -81,8 +88,10 @@ void AppListView::InitAsBubble(
|
| GetBubbleFrameView()->SetBubbleBorder(bubble_border_);
|
| SetBubbleArrowLocation(arrow_location);
|
|
|
| +#if !defined(OS_WIN)
|
| // Resets default background since AppListBubbleBorder paints background.
|
| GetBubbleFrameView()->set_background(NULL);
|
| +#endif
|
|
|
| CreateModel();
|
| }
|
| @@ -122,6 +131,13 @@ views::View* AppListView::GetInitiallyFocusedView() {
|
| return search_box_view_->search_box();
|
| }
|
|
|
| +gfx::ImageSkia AppListView::GetWindowAppIcon() {
|
| + if (delegate_.get())
|
| + return delegate_->GetWindowAppIcon();
|
| +
|
| + return gfx::ImageSkia();
|
| +}
|
| +
|
| bool AppListView::HasHitTestMask() const {
|
| return true;
|
| }
|
|
|