Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(209)

Side by Side Diff: chrome/browser/profiles/profile_window.cc

Issue 869793004: Bring up the Fast User Switcher on Shift+Click on the new Avatar Button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix browser tests Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/profile_window.h" 5 #include "chrome/browser/profiles/profile_window.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH; 493 *bubble_view_mode = BUBBLE_VIEW_MODE_GAIA_REAUTH;
494 return; 494 return;
495 case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN: 495 case BrowserWindow::AVATAR_BUBBLE_MODE_CONFIRM_SIGNIN:
496 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER; 496 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
497 *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN; 497 *tutorial_mode = TUTORIAL_MODE_CONFIRM_SIGNIN;
498 return; 498 return;
499 case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR: 499 case BrowserWindow::AVATAR_BUBBLE_MODE_SHOW_ERROR:
500 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER; 500 *bubble_view_mode = BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
501 *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR; 501 *tutorial_mode = TUTORIAL_MODE_SHOW_ERROR;
502 return; 502 return;
503 case BrowserWindow::AVATAR_BUBBLE_MODE_FAST_USER_SWITCH:
504 if (switches::IsFastUserSwitching()) {
505 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_FAST_PROFILE_CHOOSER;
noms (inactive) 2015/02/03 15:29:49 nit: no {}
anthonyvd 2015/02/03 21:53:20 Done.
506 } else {
507 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
508 }
509 return;
503 default: 510 default:
504 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER; 511 *bubble_view_mode = profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER;
505 } 512 }
506 } 513 }
507 514
508 } // namespace profiles 515 } // namespace profiles
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser_window.h » ('j') | chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698