chrome/browser/chrome_browser_main.cc - Issue 13730003: Re-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/chrome_browser_main.cc

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

Patch Set: Created 7 years, 8 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/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 031caf08c8b93710ec584ccc5fee90103bf6b675..a8abe1546820d51326fa8440b48b40eeace75e44 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -159,6 +159,7 @@

#include "chrome/browser/chromeos/cros/cros_library.h"

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

+#include "chromeos/chromeos_switches.h"

#endif

// TODO(port): several win-only methods have been pulled out of this, but

@@ -319,7 +320,7 @@ PrefService* InitializeLocalState(

}

#if defined(OS_CHROMEOS)

- if (parsed_command_line.HasSwitch(switches::kLoginManager)) {

+ if (parsed_command_line.HasSwitch(chromeos::switches::kLoginManager)) {

std::string owner_locale = local_state->GetString(prefs::kOwnerLocale);

// Ensure that we start with owner's locale.

if (!owner_locale.empty() &&