Bring up the Fast User Switcher on Shift+Click on the new Avatar Button

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ skipping 309 matching lines @@
                                            const ui::Event& event) {
   if (sender == minimize_button_) {
     frame()->Minimize();
   } else if (sender == maximize_button_) {
     frame()->Maximize();
   } else if (sender == restore_button_) {
     frame()->Restore();
   } else if (sender == close_button_) {
     frame()->Close();
   } else if (sender == new_avatar_button()) {
-    browser_view()->ShowAvatarBubbleFromAvatarButton(
-        BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT,
-        signin::ManageAccountsParams());
+    DCHECK(event.IsMouseEvent());
+    bool isRightClick =
+        static_cast<const ui::MouseEvent&>(event).IsRightMouseButton();
+
+    BrowserWindow::AvatarBubbleMode mode = isRightClick ?
+        BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH :
+        BrowserWindow::AVATAR_BUBBLE_MODE_DEFAULT;
+
+    if (switches::IsFastUserSwitching() || !isRightClick) {
+      browser_view()->ShowAvatarBubbleFromAvatarButton(
+          mode,
+          signin::ManageAccountsParams());
+    }
   }
 }
 
 void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
                                                  const gfx::Point& point) {
 #if defined(OS_LINUX)
   views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
                                 views::MenuRunner::HAS_MNEMONICS);
   ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
                                       window_icon_,
@@ skipping 579 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }