summaryrefslogtreecommitdiffstats
path: root/ash/wm/app_list_controller.cc
diff options
context:
space:
mode:
authorxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 16:41:35 +0000
committerxiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-21 16:41:35 +0000
commit801f2338946e58bb895b48c9545ca6481e15ea83 (patch)
tree4f36f6b7cc7b6e92a9f3597ff9fe64e11ab0409f /ash/wm/app_list_controller.cc
parent3b6eeec271ee568d5dd951182d2e5343cbd6af62 (diff)
downloadchromium_src-801f2338946e58bb895b48c9545ca6481e15ea83.zip
chromium_src-801f2338946e58bb895b48c9545ca6481e15ea83.tar.gz
chromium_src-801f2338946e58bb895b48c9545ca6481e15ea83.tar.bz2
Consolidate bubble border code.
Per 135200, we should only use image based code. - Add two new sets of bubble border images; - Use the new bubble border images for app menu and launcher tooltip; - Get rid of BubbleBorder2 since it's no longer needed; BUG=135200 TEST=Verify app list, launcher bar tooltip bubbles use shadow based on image and no artifacts. R=msw@chromium.org,sky@chromium.org,oshima@chromium.org Review URL: https://codereview.chromium.org/10905311 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158003 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm/app_list_controller.cc')
-rw-r--r--ash/wm/app_list_controller.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/wm/app_list_controller.cc b/ash/wm/app_list_controller.cc
index 262f91f..f6f9cdd 100644
--- a/ash/wm/app_list_controller.cc
+++ b/ash/wm/app_list_controller.cc
@@ -49,14 +49,14 @@ views::BubbleBorder::ArrowLocation GetBubbleArrowLocation() {
ShelfAlignment shelf_alignment = Shell::GetInstance()->GetShelfAlignment();
switch (shelf_alignment) {
case ash::SHELF_ALIGNMENT_BOTTOM:
- return views::BubbleBorder::BOTTOM_RIGHT;
+ return views::BubbleBorder::BOTTOM_CENTER;
case ash::SHELF_ALIGNMENT_LEFT:
- return views::BubbleBorder::LEFT_BOTTOM;
+ return views::BubbleBorder::LEFT_CENTER;
case ash::SHELF_ALIGNMENT_RIGHT:
- return views::BubbleBorder::RIGHT_BOTTOM;
+ return views::BubbleBorder::RIGHT_CENTER;
default:
NOTREACHED() << "Unknown shelf alignment " << shelf_alignment;
- return views::BubbleBorder::BOTTOM_RIGHT;
+ return views::BubbleBorder::BOTTOM_CENTER;
}
}