diff options
author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 15:46:26 +0000 |
---|---|---|
committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-15 15:46:26 +0000 |
commit | e9c0ba7ac5987a7cc3ce2bfa2c8441862b77d258 (patch) | |
tree | f35d5e9d597b1719dac859e47d38e4458cbccc3f /base/sys_info_posix.cc | |
parent | 32d792580c3685b549541109bb294e7a6f5b6def (diff) | |
download | chromium_src-e9c0ba7ac5987a7cc3ce2bfa2c8441862b77d258.zip chromium_src-e9c0ba7ac5987a7cc3ce2bfa2c8441862b77d258.tar.gz chromium_src-e9c0ba7ac5987a7cc3ce2bfa2c8441862b77d258.tar.bz2 |
base: Move UI code out of SysInfo.
This moves GetPrimaryDisplayDimensions() and DisplayCount()
out of base and into a new DisplayUtils class (currently
alongside the metrics code, since that's the only place that
they're called). These methods add a GDK dependency that
prevents Chrome OS from including process_util (which
depends on SysInfo) in its libchrome library.
BUG=chromium-os:16153
TEST=moved existing unit tests
Review URL: http://codereview.chromium.org/7128001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/sys_info_posix.cc')
-rw-r--r-- | base/sys_info_posix.cc | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/base/sys_info_posix.cc b/base/sys_info_posix.cc index 3da08e1..d635eb4 100644 --- a/base/sys_info_posix.cc +++ b/base/sys_info_posix.cc @@ -12,10 +12,6 @@ #include <sys/utsname.h> #include <unistd.h> -#if !defined(OS_MACOSX) -#include <gdk/gdk.h> -#endif - #include "base/basictypes.h" #include "base/file_util.h" #include "base/logging.h" @@ -78,30 +74,6 @@ std::string SysInfo::CPUArchitecture() { return std::string(info.machine); } -#if !defined(OS_MACOSX) -// static -void SysInfo::GetPrimaryDisplayDimensions(int* width, int* height) { - // Note that Bad Things Happen if this isn't called from the UI thread, - // but also that there's no way to check that from here. :( - GdkScreen* screen = gdk_screen_get_default(); - if (width) - *width = gdk_screen_get_width(screen); - if (height) - *height = gdk_screen_get_height(screen); -} - -// static -int SysInfo::DisplayCount() { - // Note that Bad Things Happen if this isn't called from the UI thread, - // but also that there's no way to check that from here. :( - - // This query is kinda bogus for Linux -- do we want number of X screens? - // The number of monitors Xinerama has? We'll just use whatever GDK uses. - GdkScreen* screen = gdk_screen_get_default(); - return gdk_screen_get_n_monitors(screen); -} -#endif - // static size_t SysInfo::VMAllocationGranularity() { return getpagesize(); |