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

Unified Diff: ash/wm/immersive_fullscreen_controller.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/wm/drag_window_resizer_unittest.cc ('k') | ash/wm/lock_layout_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/immersive_fullscreen_controller.cc
diff --git a/ash/wm/immersive_fullscreen_controller.cc b/ash/wm/immersive_fullscreen_controller.cc
index 538323687091efaca6f609dd17e7526dd97290da..7d0a85157fec38be45eda71a8fb24878fca3f302 100644
--- a/ash/wm/immersive_fullscreen_controller.cc
+++ b/ash/wm/immersive_fullscreen_controller.cc
@@ -99,7 +99,7 @@ gfx::Point GetEventLocationInScreen(const ui::LocatedEvent& event) {
// Returns the bounds of the display nearest to |window| in screen coordinates.
gfx::Rect GetDisplayBoundsInScreen(aura::Window* window) {
- return Shell::GetScreen()->GetDisplayNearestWindow(window).bounds();
+ return gfx::Screen::GetScreen()->GetDisplayNearestWindow(window).bounds();
}
} // namespace
@@ -926,7 +926,7 @@ bool ImmersiveFullscreenController::ShouldHandleGestureEvent(
// closest screen ensures that the event is from a valid bezel (as opposed to
// another screen in an extended desktop).
gfx::Rect screen_bounds =
- Shell::GetScreen()->GetDisplayNearestPoint(location).bounds();
+ gfx::Screen::GetScreen()->GetDisplayNearestPoint(location).bounds();
return (!screen_bounds.Contains(location) &&
location.y() < hit_bounds_in_screen.y() &&
location.x() >= hit_bounds_in_screen.x() &&
« no previous file with comments | « ash/wm/drag_window_resizer_unittest.cc ('k') | ash/wm/lock_layout_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698