| Index: ash/system/tray/system_tray.cc
|
| diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
|
| index 3f4d5db032c76c458d83db2783b84a330bee9f07..f2c2e06f3fb1393ae8727b091878f6eaef71f5da 100644
|
| --- a/ash/system/tray/system_tray.cc
|
| +++ b/ash/system/tray/system_tray.cc
|
| @@ -32,9 +32,9 @@
|
| #include "ui/aura/window_event_dispatcher.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/compositor/layer.h"
|
| +#include "ui/display/screen.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/gfx/canvas.h"
|
| -#include "ui/gfx/screen.h"
|
| #include "ui/gfx/skia_util.h"
|
| #include "ui/views/border.h"
|
| #include "ui/views/controls/label.h"
|
| @@ -364,7 +364,7 @@ bool SystemTray::IsMouseInNotificationBubble() const {
|
| if (!notification_bubble_)
|
| return false;
|
| return notification_bubble_->bubble_view()->GetBoundsInScreen().Contains(
|
| - gfx::Screen::GetScreen()->GetCursorScreenPoint());
|
| + display::Screen::GetScreen()->GetCursorScreenPoint());
|
| }
|
|
|
| bool SystemTray::CloseSystemBubble() const {
|
| @@ -594,7 +594,7 @@ void SystemTray::UpdateWebNotifications() {
|
| int height = 0;
|
| if (bubble_view) {
|
| gfx::Rect work_area =
|
| - gfx::Screen::GetScreen()
|
| + display::Screen::GetScreen()
|
| ->GetDisplayNearestWindow(bubble_view->GetWidget()->GetNativeView())
|
| .work_area();
|
| height =
|
|
|