diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-27 19:28:24 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-27 19:28:24 +0000 |
| commit | 49c4cf85a2b9ae985227799db540dd771f39ab26 (patch) | |
| tree | c0da67aeb51650e33a9482d5d738042a50306bbb /chromeos/login | |
| parent | 28dd8d9866e692882dc4797bc288b4763e03c25f (diff) | |
| download | chromium_src-49c4cf85a2b9ae985227799db540dd771f39ab26.zip chromium_src-49c4cf85a2b9ae985227799db540dd771f39ab26.tar.gz chromium_src-49c4cf85a2b9ae985227799db540dd771f39ab26.tar.bz2 | |
Move IsRunningOnChromeOS to SysInfo
Also, use lsb-release/CHROMEOS_RELEASE_NAME instead of the
USER env variable.
This CL depends on https://codereview.chromium.org/23588009/
BUG=270135
For trivial base/ changes:
R=derat@chromium.org, satorux@chromium.org, sky@chromium.org
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/23904025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225761 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/login')
| -rw-r--r-- | chromeos/login/login_state.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chromeos/login/login_state.cc b/chromeos/login/login_state.cc index 57a889b..a1f1fbb 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); } |