diff options
| author | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 17:16:07 +0000 |
|---|---|---|
| committer | harrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-12 17:16:07 +0000 |
| commit | 8572c4870436356bbb3541383f3af797890a4aee (patch) | |
| tree | a096b3185e3d2275c762894cd5b8ce8ca70c9759 /ash/wm/app_list_controller.cc | |
| parent | 34219e93c43e8b7063848700ffcb60624ccdcdba (diff) | |
| download | chromium_src-8572c4870436356bbb3541383f3af797890a4aee.zip chromium_src-8572c4870436356bbb3541383f3af797890a4aee.tar.gz chromium_src-8572c4870436356bbb3541383f3af797890a4aee.tar.bz2 | |
Add option to align launcher/shelf to top of screen (similar to left/right align).
BUG=159770
Review URL: https://chromiumcodereview.appspot.com/11885007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@176556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
| -rw-r--r-- | ash/wm/app_list_controller.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc index 0063d37..c95e1a4 100644 --- a/ash/wm/app_list_controller.cc +++ b/ash/wm/app_list_controller.cc @@ -49,7 +49,8 @@ views::BubbleBorder::ArrowLocation GetBubbleArrowLocation( SelectValueForShelfAlignment( views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER, - views::BubbleBorder::RIGHT_CENTER); + views::BubbleBorder::RIGHT_CENTER, + views::BubbleBorder::TOP_CENTER); } // Offset given |rect| towards shelf. @@ -68,8 +69,8 @@ gfx::Rect OffsetTowardsShelf(const gfx::Rect& rect, views::Widget* widget) { case SHELF_ALIGNMENT_RIGHT: offseted.Offset(kAnimationOffset, 0); break; - default: - NOTREACHED() << "Unknown shelf alignment " << shelf_alignment; + case SHELF_ALIGNMENT_TOP: + offseted.Offset(0, -kAnimationOffset); break; } |