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

Unified Diff: ash/test/display_manager_test_api.cc

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: GetNativeScreen 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
Index: ash/test/display_manager_test_api.cc
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 8de31dca765595539c2be501651366055d70607a..af757d833ce4d07b88bc6d3756a7c9d454539853 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -59,14 +59,13 @@ std::vector<DisplayInfo> CreateDisplayInfoListFromString(
bool DisplayManagerTestApi::TestIfMouseWarpsAt(
ui::test::EventGenerator& event_generator,
const gfx::Point& point_in_screen) {
- aura::Window* context = Shell::GetAllRootWindows()[0];
DCHECK(!Shell::GetInstance()->display_manager()->IsInUnifiedMode());
static_cast<ExtendedMouseWarpController*>(
Shell::GetInstance()
->mouse_cursor_filter()
->mouse_warp_controller_for_test())
->allow_non_native_event_for_test();
- gfx::Screen* screen = gfx::Screen::GetScreenFor(context);
+ gfx::Screen* screen = gfx::Screen::GetScreen();
gfx::Display original_display =
screen->GetDisplayNearestPoint(point_in_screen);
event_generator.MoveMouseTo(point_in_screen);

Powered by Google App Engine
This is Rietveld 408576698