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

Unified Diff: ash/display/unified_mouse_warp_controller.cc

Issue 2314203002: Move DisplayList to display; add ScreenBase. (Closed)
Patch Set: Update unit test namespace. Created 4 years, 3 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/display/mirror_window_controller.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/unified_mouse_warp_controller.cc
diff --git a/ash/display/unified_mouse_warp_controller.cc b/ash/display/unified_mouse_warp_controller.cc
index d2c7c4930fa224f7653dfcabc9c44c921f08c4d1..224ef5ad24ccacfbcbed1af4fbc38c42c8679ec8 100644
--- a/ash/display/unified_mouse_warp_controller.cc
+++ b/ash/display/unified_mouse_warp_controller.cc
@@ -39,7 +39,7 @@ AshWindowTreeHost* GetMirroringAshWindowTreeHostForDisplayId(
// the |point_in_screen|. Returns nullptr if such WTH does not exist.
aura::WindowTreeHost* FindMirroringWindowTreeHostFromScreenPoint(
const gfx::Point& point_in_screen) {
- display::DisplayList mirroring_display_list =
+ display::Displays mirroring_display_list =
Shell::GetInstance()
->display_manager()
->software_mirroring_display_list();
@@ -78,7 +78,7 @@ bool UnifiedMouseWarpController::WarpMouseCursor(ui::MouseEvent* event) {
aura::client::CursorClient* cursor_client =
aura::client::GetCursorClient(target->GetRootWindow());
if (cursor_client) {
- display::DisplayList mirroring_display_list =
+ display::Displays mirroring_display_list =
Shell::GetInstance()
->display_manager()
->software_mirroring_display_list();
@@ -122,9 +122,9 @@ void UnifiedMouseWarpController::SetEnabled(bool enabled) {
}
void UnifiedMouseWarpController::ComputeBounds() {
- display::DisplayList display_list = Shell::GetInstance()
- ->display_manager()
- ->software_mirroring_display_list();
+ display::Displays display_list = Shell::GetInstance()
+ ->display_manager()
+ ->software_mirroring_display_list();
if (display_list.size() < 2) {
LOG(ERROR) << "Mirroring Display lost during re-configuration";
@@ -156,9 +156,9 @@ bool UnifiedMouseWarpController::WarpMouseCursorInNativeCoords(
bool in_second_edge = second_edge_bounds_in_native_.Contains(point_in_native);
if (!in_first_edge && !in_second_edge)
return false;
- display::DisplayList display_list = Shell::GetInstance()
- ->display_manager()
- ->software_mirroring_display_list();
+ display::Displays display_list = Shell::GetInstance()
+ ->display_manager()
+ ->software_mirroring_display_list();
// Wait updating the cursor until the cursor moves to the new display
// to avoid showing the wrong sized cursor at the source display.
current_cursor_display_id_ =
« no previous file with comments | « ash/display/mirror_window_controller.cc ('k') | ash/mus/test/wm_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698