| commit | 49c4cf85a2b9ae985227799db540dd771f39ab26 | [log] [tgz] |
|---|---|---|
| author | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Sep 27 19:28:24 2013 |
| committer | [email protected] <[email protected]@0039d316-1c4b-4281-b951-d872f2087c98> | Fri Sep 27 19:28:24 2013 |
| tree | c0da67aeb51650e33a9482d5d738042a50306bbb | |
| parent | 28dd8d9866e692882dc4797bc288b4763e03c25f [diff] [blame] |
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: [email protected], [email protected], [email protected] [email protected] Review URL: https://codereview.chromium.org/23904025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225761 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 11a211f..4de27d4f 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -52,8 +52,8 @@ #include "net/url_request/url_request.h" #if defined(OS_CHROMEOS) -#include "base/chromeos/chromeos_version.h" #include "base/command_line.h" +#include "base/sys_info.h" #include "chrome/common/chrome_switches.h" #endif @@ -641,7 +641,7 @@ #if defined(OS_CHROMEOS) // If we're running Chrome for ChromeOS on Linux, we want to allow file // access. - if (!base::chromeos::IsRunningOnChromeOS() || + if (!base::SysInfo::IsRunningOnChromeOS() || CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType)) { return true; }