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

Unified Diff: chrome/browser/app_controller_mac.mm

Issue 564453003: Access to Chrome via the System Tray should go through the User Manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Pkasting's nits Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/app_controller_mac.mm
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 4bbc7c94fceecc4d199f1560f6f609fb1adb678e..9c7d412a97955cee682059fbe9765652452e726e 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -69,6 +69,7 @@
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
#include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
+#include "chrome/browser/ui/user_manager.h"
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/cloud_print/cloud_print_class_mac.h"
@@ -1046,7 +1047,9 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
// for a locked profile, we have to show the User Manager instead as the
// locked profile needs authentication.
if (IsProfileSignedOut(lastProfile)) {
- chrome::ShowUserManager(lastProfile->GetPath());
+ UserManager::Show(lastProfile->GetPath(),
+ profiles::USER_MANAGER_NO_TUTORIAL,
+ profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
return;
}
@@ -1247,10 +1250,13 @@ class AppControllerProfileObserver : public ProfileInfoCacheObserver {
// implemented as forced incognito, we can't open a new guest browser either,
// so we have to show the User Manager as well.
Profile* lastProfile = [self lastProfile];
- if (lastProfile->IsGuestSession() || IsProfileSignedOut(lastProfile))
- chrome::ShowUserManager(lastProfile->GetPath());
- else
+ if (lastProfile->IsGuestSession() || IsProfileSignedOut(lastProfile)) {
+ UserManager::Show(lastProfile->GetPath(),
+ profiles::USER_MANAGER_NO_TUTORIAL,
Alexei Svitkine (slow) 2014/09/18 20:54:04 Nit: Align.
+ profiles::USER_MANAGER_SELECT_PROFILE_NO_ACTION);
+ } else {
CreateBrowser(lastProfile);
+ }
// We've handled the reopen event, so return NO to tell AppKit not
// to do anything.

Powered by Google App Engine
This is Rietveld 408576698