Move DisplayUtils methods into gfx::Screen.

chrome/browser/metrics/metrics_log.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/metrics/metrics_log.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/perftimer.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/third_party/nspr/prtime.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/metrics/display_utils.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/gpu/gpu_data_manager.h"
 #include "googleurl/src/gurl.h"
+#include "ui/gfx/screen.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 #if defined(OS_WIN)
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 #endif
 
 MetricsLog::MetricsLog(const std::string& client_id, int session_id)
@@ skipping 310 matching lines @@
     OPEN_ELEMENT_FOR_SCOPE("gpu");
     GpuDataManager* gpu_data_manager = GpuDataManager::GetInstance();
     if (gpu_data_manager) {
       WriteIntAttribute("vendorid", gpu_data_manager->gpu_info().vendor_id);
       WriteIntAttribute("deviceid", gpu_data_manager->gpu_info().device_id);
     }
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("display");
-    int width = 0;
-    int height = 0;
-    DisplayUtils::GetPrimaryDisplayDimensions(&width, &height);
-    WriteIntAttribute("xsize", width);
-    WriteIntAttribute("ysize", height);
-    WriteIntAttribute("screens", DisplayUtils::GetDisplayCount());
+    const gfx::Size display_size = gfx::Screen::GetPrimaryMonitorSize();
+    WriteIntAttribute("xsize", display_size.width());
+    WriteIntAttribute("ysize", display_size.height());
+    WriteIntAttribute("screens", gfx::Screen::GetNumMonitors());
   }
 
   {
     OPEN_ELEMENT_FOR_SCOPE("bookmarks");
     int num_bookmarks_on_bookmark_bar =
         pref->GetInteger(prefs::kNumBookmarksOnBookmarkBar);
     int num_folders_on_bookmark_bar =
         pref->GetInteger(prefs::kNumFoldersOnBookmarkBar);
     int num_bookmarks_in_other_bookmarks_folder =
         pref->GetInteger(prefs::kNumBookmarksInOtherBookmarkFolder);
@@ skipping 118 matching lines @@
       const std::string result_type(AutocompleteMatch::TypeToString(i->type));
       if (!result_type.empty())
         WriteAttribute("resulttype", result_type);
       WriteIntAttribute("relevance", i->relevance);
       WriteIntAttribute("isstarred", i->starred ? 1 : 0);
     }
   }
 
   ++num_events_;
 }