summaryrefslogtreecommitdiffstats
path: root/ui/views
diff options
context:
space:
mode:
authorharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 17:16:07 +0000
committerharrym@chromium.org <harrym@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-12 17:16:07 +0000
commit8572c4870436356bbb3541383f3af797890a4aee (patch)
treea096b3185e3d2275c762894cd5b8ce8ca70c9759 /ui/views
parent34219e93c43e8b7063848700ffcb60624ccdcdba (diff)
downloadchromium_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 'ui/views')
-rw-r--r--ui/views/bubble/tray_bubble_view.cc2
-rw-r--r--ui/views/bubble/tray_bubble_view.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/ui/views/bubble/tray_bubble_view.cc b/ui/views/bubble/tray_bubble_view.cc
index 9a7b041..256c8af 100644
--- a/ui/views/bubble/tray_bubble_view.cc
+++ b/ui/views/bubble/tray_bubble_view.cc
@@ -247,6 +247,8 @@ TrayBubbleView* TrayBubbleView::Create(gfx::NativeView parent_window,
if (init_params->anchor_alignment == ANCHOR_ALIGNMENT_BOTTOM) {
init_params->arrow_location = base::i18n::IsRTL() ?
views::BubbleBorder::BOTTOM_LEFT : views::BubbleBorder::BOTTOM_RIGHT;
+ } else if (init_params->anchor_alignment == ANCHOR_ALIGNMENT_TOP) {
+ init_params->arrow_location = views::BubbleBorder::TOP_LEFT;
} else if (init_params->anchor_alignment == ANCHOR_ALIGNMENT_LEFT) {
init_params->arrow_location = views::BubbleBorder::LEFT_BOTTOM;
} else {
diff --git a/ui/views/bubble/tray_bubble_view.h b/ui/views/bubble/tray_bubble_view.h
index 2a2ea44..b1c3373 100644
--- a/ui/views/bubble/tray_bubble_view.h
+++ b/ui/views/bubble/tray_bubble_view.h
@@ -40,7 +40,8 @@ class VIEWS_EXPORT TrayBubbleView : public views::BubbleDelegateView {
enum AnchorAlignment {
ANCHOR_ALIGNMENT_BOTTOM,
ANCHOR_ALIGNMENT_LEFT,
- ANCHOR_ALIGNMENT_RIGHT
+ ANCHOR_ALIGNMENT_RIGHT,
+ ANCHOR_ALIGNMENT_TOP
};
class VIEWS_EXPORT Delegate {