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

1 files changed, 0 insertions, 44 deletions

diff --git a/base/sys_info_mac.cc b/base/sys_info_mac.cc
index 6ffb42f..d8210a2 100644
--- a/base/sys_info_mac.cc
+++ b/base/sys_info_mac.cc
@@ -55,48 +55,4 @@ int64 SysInfo::AmountOfPhysicalMemory() {
   return static_cast<int64>(hostinfo.max_mem);
 }
 
-// static
-void SysInfo::GetPrimaryDisplayDimensions(int* width, int* height) {
-  CGDirectDisplayID main_display = CGMainDisplayID();
-  if (width)
-    *width = CGDisplayPixelsWide(main_display);
-  if (height)
-    *height = CGDisplayPixelsHigh(main_display);
-}
-
-// static
-int SysInfo::DisplayCount() {
-  // Don't just return the number of online displays.  It includes displays
-  // that mirror other displays, which are not desired in the count.  It's
-  // tempting to use the count returned by CGGetActiveDisplayList, but active
-  // displays exclude sleeping displays, and those are desired in the count.
-
-  // It would be ridiculous to have this many displays connected, but
-  // CGDirectDisplayID is just an integer, so supporting up to this many
-  // doesn't hurt.
-  CGDirectDisplayID online_displays[128];
-  CGDisplayCount online_display_count = 0;
-  if (CGGetOnlineDisplayList(arraysize(online_displays),
-                             online_displays,
-                             &online_display_count) != kCGErrorSuccess) {
-    // 1 is a reasonable assumption.
-    return 1;
-  }
-
-  int display_count = 0;
-  for (CGDisplayCount online_display_index = 0;
-       online_display_index < online_display_count;
-       ++online_display_index) {
-    CGDirectDisplayID online_display = online_displays[online_display_index];
-    if (CGDisplayMirrorsDisplay(online_display) == kCGNullDirectDisplay) {
-      // If this display doesn't mirror any other, include it in the count.
-      // The primary display in a mirrored set will be counted, but those that
-      // mirror it will not be.
-      ++display_count;
-    }
-  }
-
-  return display_count;
-}
-
 }  // namespace base