Chromium Code Reviews| Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
| 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 1815dea8947f52d17ae09f7f3716cbbba7450272..f44789229a1464e521442b3f3decc228c54d5d21 100644 |
| --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
| +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc |
| @@ -327,9 +327,24 @@ void OpaqueBrowserFrameView::ButtonPressed(views::Button* sender, |
| } else if (sender == close_button_) { |
| frame()->Close(); |
| } else if (sender == new_avatar_button()) { |
| - browser_view()->ShowAvatarBubbleFromAvatarButton( |
| - BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT, |
| + BrowserWindow::AvatarBubbleMode mode = |
| + BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT; |
| + if (!switches::IsFastUserSwitching()) { |
| + if (event.IsMouseEvent() && |
| + static_cast<const ui::MouseEvent&>(event).IsLeftMouseButton()){ |
|
Roger Tawa OOO till Jul 10th
2015/01/29 23:00:35
Space before {
anthonyvd
2015/01/30 15:02:20
Done.
|
| + browser_view()->ShowAvatarBubbleFromAvatarButton( |
| + mode, |
| + signin::ManageAccountsParams()); |
| + } |
| + } else { |
| + if (event.IsMouseEvent() && |
| + static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { |
| + mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; |
| + } |
| + browser_view()->ShowAvatarBubbleFromAvatarButton( |
| + mode, |
| signin::ManageAccountsParams()); |
| + } |
| } |
| } |