Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: ash/system/tray/system_tray.cc

Issue 1608053002: Remove now-unnecessary wrappers around gfx::Screen::GetScreen() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-5
Patch Set: cros Created 4 years, 11 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
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « ash/system/chromeos/tray_display.cc ('k') | ash/system/web_notification/ash_popup_alignment_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698