diff options
| author | Michael Lerman <mlerman@chromium.org> | 2015-03-03 13:53:40 -0500 |
|---|---|---|
| committer | Michael Lerman <mlerman@chromium.org> | 2015-03-03 18:54:47 +0000 |
| commit | 9a6fd173ae0c05fec2dda1730786df700c7d7f2a (patch) | |
| tree | aa4786f05440b20eca608d4eb07608591a012b46 | |
| parent | 97f59e93f30b448aa12faf1bd78adf2b49e14cc7 (diff) | |
| download | chromium_src-9a6fd173ae0c05fec2dda1730786df700c7d7f2a.zip chromium_src-9a6fd173ae0c05fec2dda1730786df700c7d7f2a.tar.gz chromium_src-9a6fd173ae0c05fec2dda1730786df700c7d7f2a.tar.bz2 | |
Fix the Fast User Switcher in the Windows Native frame.
BUG=457462
R=anthonyvd@chromium.org
TBR=anthonyvd@chromium.org
TEST=
1. Disable #enable-fast-user-switcher and enable #new-avatar-menu flags in chrome://flags
2. Relaunch Chrome
3. Right click on the Avatar Button, the fast user switcher should be shown
4. Command+Click on the Avatar Button, nothing should happen
5. Test the functionality with and without custom themes active
Review URL: https://codereview.chromium.org/950293003
Cr-Commit-Position: refs/heads/master@{#317917}
(cherry picked from commit dabd39abad0a01181dd6617199b9f2d9e606f065)
Review URL: https://codereview.chromium.org/972233002
Cr-Commit-Position: refs/branch-heads/2311@{#105}
Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
| -rw-r--r-- | chrome/browser/ui/views/frame/glass_browser_frame_view.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/ui/views/frame/opaque_browser_frame_view.cc | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 4eaaf06..af61255 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -295,8 +295,14 @@ void GlassBrowserFrameView::Layout() { void GlassBrowserFrameView::ButtonPressed(views::Button* sender, const ui::Event& event) { if (sender == new_avatar_button()) { + BrowserWindow::AvatarBubbleMode mode = + BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT; + if (event.IsMouseEvent() && + static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { + mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; + } browser_view()->ShowAvatarBubbleFromAvatarButton( - BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, + mode, signin::ManageAccountsParams()); } } diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 72dd08d..a4c89ff 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -327,14 +327,12 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender, } else if (sender == close_button_) { frame()->Close(); } else if (sender == new_avatar_button()) { - DCHECK(event.IsMouseEvent()); - bool isRightClick = - static_cast<const ui::MouseEvent&>(event).IsRightMouseButton(); - - BrowserWindow::AvatarBubbleMode mode = isRightClick ? - BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH : + BrowserWindow::AvatarBubbleMode mode = BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT; - + if (event.IsMouseEvent() && + static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { + mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; + } browser_view()->ShowAvatarBubbleFromAvatarButton( mode, signin::ManageAccountsParams()); |