chrome/browser/ui/views/notifications/balloon_collection_views.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/ui/views/notifications/balloon_collection_views.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 some new gfx::Screen additions 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

« chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc ('K') | « chrome/browser/ui/views/fullscreen_exit_bubble_views.cc ('k') | chrome/browser/ui/views/panels/panel_view.cc » ('j') | chrome/browser/ui/views/status_bubble_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/notifications/balloon_collection_views.cc

diff --git a/chrome/browser/ui/views/notifications/balloon_collection_views.cc b/chrome/browser/ui/views/notifications/balloon_collection_views.cc

index a66ea192b14081b1c25878a961e1a38555eba63d..8e3af62f0a166d46ffcc9979dc82451389bc813e 100644

--- a/chrome/browser/ui/views/notifications/balloon_collection_views.cc

+++ b/chrome/browser/ui/views/notifications/balloon_collection_views.cc

@@ -80,7 +80,8 @@ bool BalloonCollectionImpl::IsCursorInBalloonCollection() const {

#else

// TODO(saintlou): Not sure if this is correct because on Windows at least

// the following call is GetCursorPos() not GetMessagePos().

- gfx::Point cursor(gfx::Screen::GetCursorScreenPoint());

+ // TODO(scottmg): NativeScreen might be wrong. http://crbug.com/133312

+ gfx::Point cursor(gfx::Screen::GetNativeScreen()->GetCursorScreenPoint());

#endif

return GetBalloonsBoundingBox().Contains(cursor);

}