Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Unified Diff: chrome/browser/metrics/metrics_log.cc

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tidy Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/metrics/metrics_log.cc
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 2771aa9f077ce10addf5e1884d457f4991ee50fe..a4397264c885efe3d41f2d2058efbe101a394d69 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -344,15 +344,17 @@ PrefService* MetricsLog::GetPrefService() {
}
gfx::Size MetricsLog::GetScreenSize() const {
- return gfx::Screen::GetPrimaryDisplay().GetSizeInPixel();
+ return gfx::Screen::GetPrimaryDisplay(
+ gfx::Screen::BadTwoWorldsContext()).GetSizeInPixel();
}
float MetricsLog::GetScreenDeviceScaleFactor() const {
- return gfx::Screen::GetPrimaryDisplay().device_scale_factor();
+ return gfx::Screen::GetPrimaryDisplay(
+ gfx::Screen::BadTwoWorldsContext()).device_scale_factor();
}
int MetricsLog::GetScreenCount() const {
- return gfx::Screen::GetNumDisplays();
+ return gfx::Screen::GetNumDisplays(gfx::Screen::BadTwoWorldsContext());
}
void MetricsLog::GetFieldTrialIds(

Powered by Google App Engine
This is Rietveld 408576698