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..fb32350fb95e3f78f7e20a53483c7211441bf230 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,25 @@ 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; |
|
noms (inactive)
2015/02/03 15:29:49
nit: indent by 2 more
anthonyvd
2015/02/03 21:53:20
Done.
|
| + if (!switches::IsFastUserSwitching()) { |
| + // In not fast user switching mode, don't respond to right click |
| + if (event.IsMouseEvent() && |
| + !static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { |
|
noms (inactive)
2015/02/03 15:29:49
I'm wondering if this can this be simplified to
i
anthonyvd
2015/02/03 21:53:20
Done.
|
| + browser_view()->ShowAvatarBubbleFromAvatarButton( |
| + mode, |
| + signin::ManageAccountsParams()); |
| + } |
| + } else { |
| + if (event.IsMouseEvent() && |
|
noms (inactive)
2015/02/03 15:29:49
You should probably return early if !event.IsMouse
anthonyvd
2015/02/03 21:53:20
Done.
|
| + static_cast<const ui::MouseEvent&>(event).IsRightMouseButton()) { |
| + mode = BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH; |
| + } |
| + browser_view()->ShowAvatarBubbleFromAvatarButton( |
| + mode, |
| signin::ManageAccountsParams()); |
| + } |
| } |
| } |