Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows.
Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously.
BUG=133312
Review URL: https://chromiumcodereview.appspot.com/11030017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 40c10f5..2c4b85b 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -348,15 +348,17 @@
}
gfx::Size MetricsLog::GetScreenSize() const {
- return gfx::Screen::GetPrimaryDisplay().GetSizeInPixel();
+ return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().GetSizeInPixel();
}
float MetricsLog::GetScreenDeviceScaleFactor() const {
- return gfx::Screen::GetPrimaryDisplay().device_scale_factor();
+ return gfx::Screen::GetNativeScreen()->
+ GetPrimaryDisplay().device_scale_factor();
}
int MetricsLog::GetScreenCount() const {
- return gfx::Screen::GetNumDisplays();
+ // TODO(scottmg): NativeScreen maybe wrong. http://crbug.com/133312
+ return gfx::Screen::GetNativeScreen()->GetNumDisplays();
}
void MetricsLog::GetFieldTrialIds(
