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

Unified Diff: ash/wm/system_gesture_event_filter_unittest.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/panels/panel_window_resizer.cc ('k') | ash/wm/toplevel_window_event_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter_unittest.cc
diff --git a/ash/wm/system_gesture_event_filter_unittest.cc b/ash/wm/system_gesture_event_filter_unittest.cc
index f874bec5141e895f9986c724018075eade50d2c8..6bb3700e97918b7413fab3491f8bef5efca8bc5c 100644
--- a/ash/wm/system_gesture_event_filter_unittest.cc
+++ b/ash/wm/system_gesture_event_filter_unittest.cc
@@ -477,8 +477,9 @@ TEST_F(SystemGestureEventFilterTest, DragLeftNearEdgeSnaps) {
ui::test::EventGenerator generator(root_window, toplevel_window);
// Check that dragging left snaps before reaching the screen edge.
- gfx::Rect work_area =
- Shell::GetScreen()->GetDisplayNearestWindow(root_window).work_area();
+ gfx::Rect work_area = gfx::Screen::GetScreen()
+ ->GetDisplayNearestWindow(root_window)
+ .work_area();
int drag_x = work_area.x() + 20 - points[0].x();
generator.GestureMultiFingerScroll(
kTouchPoints, points, 120, kSteps, drag_x, 0);
@@ -505,8 +506,9 @@ TEST_F(SystemGestureEventFilterTest, DragRightNearEdgeSnaps) {
ui::test::EventGenerator generator(root_window, toplevel_window);
// Check that dragging right snaps before reaching the screen edge.
- gfx::Rect work_area =
- Shell::GetScreen()->GetDisplayNearestWindow(root_window).work_area();
+ gfx::Rect work_area = gfx::Screen::GetScreen()
+ ->GetDisplayNearestWindow(root_window)
+ .work_area();
int drag_x = work_area.right() - 20 - points[0].x();
generator.GestureMultiFingerScroll(
kTouchPoints, points, 120, kSteps, drag_x, 0);
« no previous file with comments | « ash/wm/panels/panel_window_resizer.cc ('k') | ash/wm/toplevel_window_event_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698