chrome/browser/notifications/balloon_collection_impl.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/notifications/balloon_collection_impl.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/metrics/metrics_log.cc ('k') | chrome/browser/tab_contents/thumbnail_generator.cc » ('j') | chrome/browser/ui/panels/panel_mouse_watcher_timer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/balloon_collection_impl.cc

diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc

index f5e7317df9da5290a38c11638ea5fb3ba0f17f4e..9960c3a2419adb44a24550e0e77367103b0e8f3b 100644

--- a/chrome/browser/notifications/balloon_collection_impl.cc

+++ b/chrome/browser/notifications/balloon_collection_impl.cc

@@ -464,7 +464,8 @@ bool BalloonCollectionImpl::Layout::RefreshSystemMetrics() {

#if defined(OS_MACOSX)

gfx::Rect new_work_area = GetMacWorkArea();

#else

- gfx::Rect new_work_area = gfx::Screen::GetPrimaryDisplay().work_area();

+ gfx::Rect new_work_area = gfx::Screen::GetPrimaryDisplay(

+ gfx::Screen::BadTwoWorldsContext()).work_area();

#endif

if (!work_area_.Equals(new_work_area)) {

work_area_.SetRect(new_work_area.x(), new_work_area.y(),