Index: ash/system/tray/system_tray.cc |
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc |
index 396762c22d48c70615d30e7d32b43668f1349044..a3130a965c8d5c1437f575a0bfd8ad06291d1529 100644 |
--- a/ash/system/tray/system_tray.cc |
+++ b/ash/system/tray/system_tray.cc |
@@ -365,7 +365,7 @@ bool SystemTray::IsMouseInNotificationBubble() const { |
if (!notification_bubble_) |
return false; |
return notification_bubble_->bubble_view()->GetBoundsInScreen().Contains( |
- Shell::GetScreen()->GetCursorScreenPoint()); |
+ gfx::Screen::GetScreen()->GetCursorScreenPoint()); |
} |
bool SystemTray::CloseSystemBubble() const { |
@@ -595,8 +595,10 @@ void SystemTray::UpdateWebNotifications() { |
int height = 0; |
if (bubble_view) { |
- gfx::Rect work_area = Shell::GetScreen()->GetDisplayNearestWindow( |
- bubble_view->GetWidget()->GetNativeView()).work_area(); |
+ gfx::Rect work_area = |
+ gfx::Screen::GetScreen() |
+ ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView()) |
+ .work_area(); |
if (GetShelfLayoutManager()->GetAlignment() != SHELF_ALIGNMENT_TOP) { |
height = std::max( |
0, work_area.height() - bubble_view->GetBoundsInScreen().y()); |