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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.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 | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 75c7386e90fcbc5e76a4dd98a7db5932461bd8a0..74592fcf68a2cba6f495644d5ba85de7ec3c0367 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -40,6 +40,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/url_constants.h"
+#include "chromeos/chromeos_switches.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "chromeos/dbus/power_manager_client.h"
#include "chromeos/dbus/session_manager_client.h"
@@ -54,7 +55,8 @@ bool ChromeShellDelegate::IsUserLoggedIn() const {
// workstation) and not running as login-manager, pretend like we're always
// logged in.
if (!base::chromeos::IsRunningOnChromeOS() &&
- !CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager)) {
+ !CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kLoginManager)) {
return true;
}
@@ -67,11 +69,13 @@ bool ChromeShellDelegate::IsSessionStarted() const {
}
bool ChromeShellDelegate::IsGuestSession() const {
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kGuestSession);
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kGuestSession);
}
bool ChromeShellDelegate::IsFirstRunAfterBoot() const {
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kFirstBoot);
+ return CommandLine::ForCurrentProcess()->HasSwitch(
+ chromeos::switches::kFirstBoot);
}
bool ChromeShellDelegate::CanLockScreen() const {
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/browser_navigator_browsertest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698