chrome/browser/metrics/metrics_log.cc - Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix other os's 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

« no previous file with comments | « chrome/browser/download/download_util.cc ('k') | chrome/browser/notifications/balloon_collection_impl.cc » ('j') | chrome/browser/ui/panels/panel_mouse_watcher_timer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/metrics/metrics_log.cc

diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc

index 40c10f5a5806016a664b905d51cf03e86feef44c..af81f9479b001c0f4a7e799a56cfc314822694b7 100644

--- a/chrome/browser/metrics/metrics_log.cc

+++ b/chrome/browser/metrics/metrics_log.cc

@@ -348,15 +348,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(