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 /ui/compositor/compositor.cc | |
| 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 'ui/compositor/compositor.cc')
| -rw-r--r-- | ui/compositor/compositor.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc index 18815b7..5bcd1af 100644 --- a/ui/compositor/compositor.cc +++ b/ui/compositor/compositor.cc @@ -14,6 +14,7 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/string_util.h" +#include "base/sys_info.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" #include "cc/base/switches.h" @@ -38,10 +39,6 @@ #include "webkit/common/gpu/grcontext_for_webgraphicscontext3d.h" #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" -#if defined(OS_CHROMEOS) -#include "base/chromeos/chromeos_version.h" -#endif - namespace { const double kDefaultRefreshRate = 60.0; @@ -477,7 +474,7 @@ void Compositor::InitializeContextFactoryForTests(bool allow_test_contexts) { #if defined(OS_CHROMEOS) // If the test is running on the chromeos envrionment (such as // device or vm bots), always use real contexts. - if (base::chromeos::IsRunningOnChromeOS()) + if (base::SysInfo::IsRunningOnChromeOS()) use_test_contexts = false; #endif |