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

Unified Diff: chromeos/login/login_state.cc

Issue 23904025: Move IsRunningOnChromeOS to SysInfo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge fix Created 7 years, 3 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 | « chromeos/ime/xkeyboard.cc ('k') | chromeos/memory/low_memory_listener.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/login/login_state.cc
diff --git a/chromeos/login/login_state.cc b/chromeos/login/login_state.cc
index 57a889badc64bf624bef896bee19d4534d8d5785..a1f1fbbc30d4963f1b1240c264047e0f67b54b9f 100644
--- a/chromeos/login/login_state.cc
+++ b/chromeos/login/login_state.cc
@@ -4,9 +4,9 @@
#include "chromeos/login/login_state.h"
-#include "base/chromeos/chromeos_version.h"
#include "base/command_line.h"
#include "base/logging.h"
+#include "base/sys_info.h"
#include "chromeos/chromeos_switches.h"
namespace chromeos {
@@ -17,7 +17,7 @@ namespace {
// workstation) and not running as login-manager, pretend like we're always
// logged in.
bool AlwaysLoggedIn() {
- return !base::chromeos::IsRunningOnChromeOS() &&
+ return !base::SysInfo::IsRunningOnChromeOS() &&
!CommandLine::ForCurrentProcess()->HasSwitch(switches::kLoginManager);
}
« no previous file with comments | « chromeos/ime/xkeyboard.cc ('k') | chromeos/memory/low_memory_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698