diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:57:56 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 02:57:56 +0000 |
| commit | 0ac231118b5ffa2ca76423c1ecc10ca47327596f (patch) | |
| tree | fd7503398048811b348ea3b820e7600ada9946f3 /ash/wm/app_list_controller.cc | |
| parent | 7177c4325ff6804e53ae62399a48e7af7b04abec (diff) | |
| download | chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.zip chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.tar.gz chromium_src-0ac231118b5ffa2ca76423c1ecc10ca47327596f.tar.bz2 | |
Shelf Cleanup AlternateShelfLayout P1 Attempt 3
R=skuhne@chromium.org
TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org
BUG=338429
re-landing of https://codereview.chromium.org/176883022/ with fix for the inset of app panel as discussed offline /w jennyz@
Review URL: https://codereview.chromium.org/229453005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263451 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index cf5e04d..aaf7012 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -173,7 +173,7 @@ void AppListController::SetVisible(bool visible, aura::Window* window) { Shell::GetScreen()->GetPrimaryDisplay().bounds().CenterPoint(), views::BubbleBorder::FLOAT, true /* border_accepts_events */); - } else if (ash::switches::UseAlternateShelfLayout()) { + } else { gfx::Rect applist_button_bounds = Shelf::ForWindow(container)-> GetAppListButtonView()->GetBoundsInScreen(); // We need the location of the button within the local screen. @@ -190,14 +190,6 @@ void AppListController::SetVisible(bool visible, aura::Window* window) { GetBubbleArrow(container), true /* border_accepts_events */); view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE); - } else { - view->InitAsBubbleAttachedToAnchor( - container, - pagination_model_.get(), - Shelf::ForWindow(container)->GetAppListButtonView(), - gfx::Vector2d(), - GetBubbleArrow(container), - true /* border_accepts_events */); } SetView(view); // By setting us as DnD recipient, the app list knows that we can |