ash/system/web_notification/web_notification_tray.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: ash/system/web_notification/web_notification_tray.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: win fix 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: ash/system/web_notification/web_notification_tray.cc

diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc

index bd820f2ed92794f001cc180a55c841e2e60c9caa..0eacf1e3496ffe019479cc184e11d573d15114d6 100644

--- a/ash/system/web_notification/web_notification_tray.cc

+++ b/ash/system/web_notification/web_notification_tray.cc

@@ -202,7 +202,7 @@ bool WebNotificationTray::IsMouseInNotificationBubble() const {

if (!popup_bubble())

return false;

return popup_bubble_->bubble_view()->GetBoundsInScreen().Contains(

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

+ ash::Shell::GetAshScreen()->GetCursorScreenPoint());

}

void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {

« ash/system/tray/tray_background_view.h ('K') | « ash/system/tray/tray_bubble_view.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »