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

Unified Diff: trunk/src/chrome/browser/chrome_browser_main.cc

Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/
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:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/chrome_browser_main.cc
===================================================================
--- trunk/src/chrome/browser/chrome_browser_main.cc (revision 192508)
+++ trunk/src/chrome/browser/chrome_browser_main.cc (working copy)
@@ -159,7 +159,6 @@
#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
@@ -320,7 +319,7 @@
}
#if defined(OS_CHROMEOS)
- if (parsed_command_line.HasSwitch(chromeos::switches::kLoginManager)) {
+ if (parsed_command_line.HasSwitch(switches::kLoginManager)) {
std::string owner_locale = local_state->GetString(prefs::kOwnerLocale);
// Ensure that we start with owner's locale.
if (!owner_locale.empty() &&
« no previous file with comments | « trunk/src/chrome/browser/automation/automation_provider.cc ('k') | trunk/src/chrome/browser/chrome_browser_main_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698