diff options
Diffstat (limited to 'chromium/ash/display/mouse_cursor_event_filter.cc')
| -rw-r--r-- | chromium/ash/display/mouse_cursor_event_filter.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/ash/display/mouse_cursor_event_filter.cc b/chromium/ash/display/mouse_cursor_event_filter.cc index f3c3a746d47..419ea783207 100644 --- a/chromium/ash/display/mouse_cursor_event_filter.cc +++ b/chromium/ash/display/mouse_cursor_event_filter.cc @@ -5,7 +5,6 @@ #include "ash/display/mouse_cursor_event_filter.h" #include "ash/display/display_controller.h" -#include "ash/display/display_manager.h" #include "ash/display/mirror_window_controller.h" #include "ash/display/shared_display_edge_indicator.h" #include "ash/screen_ash.h" @@ -58,7 +57,7 @@ void MouseCursorEventFilter::ShowSharedEdgeIndicator( drag_source_root_ = from; DisplayLayout::Position position = Shell::GetInstance()-> - display_manager()->GetCurrentDisplayLayout().position; + display_controller()->GetCurrentDisplayLayout().position; if (position == DisplayLayout::TOP || position == DisplayLayout::BOTTOM) UpdateHorizontalIndicatorWindowBounds(); else @@ -159,7 +158,7 @@ void MouseCursorEventFilter::UpdateHorizontalIndicatorWindowBounds() { Shell::GetScreen()->GetPrimaryDisplay().bounds(); const gfx::Rect secondary_bounds = ScreenAsh::GetSecondaryDisplay().bounds(); DisplayLayout::Position position = Shell::GetInstance()-> - display_manager()->GetCurrentDisplayLayout().position; + display_controller()->GetCurrentDisplayLayout().position; src_indicator_bounds_.set_x( std::max(primary_bounds.x(), secondary_bounds.x())); @@ -188,7 +187,7 @@ void MouseCursorEventFilter::UpdateVerticalIndicatorWindowBounds() { Shell::GetScreen()->GetPrimaryDisplay().bounds(); const gfx::Rect secondary_bounds = ScreenAsh::GetSecondaryDisplay().bounds(); DisplayLayout::Position position = Shell::GetInstance()-> - display_manager()->GetCurrentDisplayLayout().position; + display_controller()->GetCurrentDisplayLayout().position; int upper_shared_y = std::max(primary_bounds.y(), secondary_bounds.y()); int lower_shared_y = std::min(primary_bounds.bottom(), |