chrome/browser/chromeos/login/user_manager_impl.cc - Issue 13671005: Re-apply 192420: Move login switches to src/chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/user_manager_impl.cc

Issue 13671005: Re-apply 192420: Move login switches to src/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 9 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:

Index: chrome/browser/chromeos/login/user_manager_impl.cc

diff --git a/chrome/browser/chromeos/login/user_manager_impl.cc b/chrome/browser/chromeos/login/user_manager_impl.cc

index 546e47b72172190eed504978d71be710ea357d0a..afa66d86249f97bf394b0483a761d5f2c71481de 100644

--- a/chrome/browser/chromeos/login/user_manager_impl.cc

+++ b/chrome/browser/chromeos/login/user_manager_impl.cc

@@ -41,6 +41,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

+#include "chromeos/chromeos_switches.h"

#include "chromeos/cryptohome/async_method_caller.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_service.h"

@@ -243,7 +244,7 @@ void UserManagerImpl::UserLoggedIn(const std::string& email,

bool browser_restart) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles))

+ if (!CommandLine::ForCurrentProcess()->HasSwitch(::switches::kMultiProfiles))

DCHECK(!IsUserLoggedIn());

if (email == kGuestUserEMail) {