summaryrefslogtreecommitdiffstats
path: root/ash/system/web_notification
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-12 19:51:17 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-12 19:51:17 +0000
commitffabb1ea75e662308da91e916a0ffc922525aa18 (patch)
tree788b1ac84169a936b02d10feda6c94efaee129ea /ash/system/web_notification
parentc856e976800426511cd1a0f74d38c1fa7c883018 (diff)
downloadchromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.zip
chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.gz
chromium_src-ffabb1ea75e662308da91e916a0ffc922525aa18.tar.bz2
Makes gfx::Screen an instance, rather than a collection of static methods.
This is in support of supporting separate Screen implementations on Aura for desktop and metro on Windows. Some callsites are not yet correct, and noted with a reference to the http://crbug.com/133312. As-is those sites will behave the same as before this patch, but may not be correct once desktop/metro can run simultaneously. BUG=133312 Review URL: https://chromiumcodereview.appspot.com/11030017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161644 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/web_notification')
-rw-r--r--ash/system/web_notification/web_notification_tray.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/web_notification/web_notification_tray.cc b/ash/system/web_notification/web_notification_tray.cc
index e5e4738..0ca6e3c 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());
+ Shell::GetScreen()->GetCursorScreenPoint());
}
void WebNotificationTray::SetShelfAlignment(ShelfAlignment alignment) {