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

Unified Diff: chrome/browser/automation/automation_provider.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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index e5ba392147ca99d158ca416f00fc7b93ab2a463e..49ea66469653b8234cf814a59dc4cae550731a6f 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -78,6 +78,7 @@
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chromeos/chromeos_switches.h"
#endif // defined(OS_CHROMEOS)
using WebKit::WebFindOptions;
@@ -216,7 +217,8 @@ bool AutomationProvider::InitializeChannel(const std::string& channel_id) {
if (use_initial_load_observers_) {
// Wait for webui login to be ready.
// Observer will delete itself.
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager) &&
+ if (CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kLoginManager) &&
!chromeos::UserManager::Get()->IsUserLoggedIn()) {
login_webui_ready_ = false;
new OOBEWebuiReadyObserver(this);
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698