| Index: ash/display/mouse_cursor_event_filter.cc
|
| diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc
|
| index 14a6913e925a7056ccecb8c4a942c73f8a274326..8f053172480f6885ba7d2efb566f7c39bc6e834a 100644
|
| --- a/ash/display/mouse_cursor_event_filter.cc
|
| +++ b/ash/display/mouse_cursor_event_filter.cc
|
| @@ -152,7 +152,6 @@ void MouseCursorEventFilter::OnDisplaysInitialized() {
|
| OnDisplayConfigurationChanged();
|
| }
|
|
|
| -#if !defined(USE_OZONE)
|
| void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
|
| // Extra check for |num_connected_displays()| is for SystemDisplayApiTest
|
| // that injects MockScreen.
|
| @@ -174,7 +173,6 @@ void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
|
| else
|
| UpdateVerticalEdgeBounds();
|
| }
|
| -#endif
|
|
|
| void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
|
| aura::Window* target = static_cast<aura::Window*>(event->target());
|
| @@ -224,7 +222,6 @@ void MouseCursorEventFilter::MoveCursorTo(aura::Window* root,
|
| root->GetHost()->MoveCursorToHostLocation(point_in_host);
|
| }
|
|
|
| -#if !defined(USE_OZONE)
|
| bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(ui::MouseEvent* event) {
|
| if (!event->HasNativeEvent())
|
| return false;
|
| @@ -263,7 +260,6 @@ bool MouseCursorEventFilter::WarpMouseCursorInNativeCoords(
|
|
|
| return true;
|
| }
|
| -#endif
|
|
|
| void MouseCursorEventFilter::UpdateHorizontalEdgeBounds() {
|
| bool from_primary = Shell::GetPrimaryRootWindow() == drag_source_root_;
|
| @@ -374,7 +370,6 @@ void MouseCursorEventFilter::GetSrcAndDstRootWindows(aura::Window** src_root,
|
| *dst_root = root_windows[0] == *src_root ? root_windows[1] : root_windows[0];
|
| }
|
|
|
| -#if !defined(USE_OZONE)
|
| bool MouseCursorEventFilter::WarpMouseCursorIfNecessaryForTest(
|
| aura::Window* target_root,
|
| const gfx::Point& point_in_screen) {
|
| @@ -383,6 +378,5 @@ bool MouseCursorEventFilter::WarpMouseCursorIfNecessaryForTest(
|
| target_root->GetHost()->ConvertPointToNativeScreen(&native);
|
| return WarpMouseCursorInNativeCoords(native, point_in_screen);
|
| }
|
| -#endif
|
|
|
| } // namespace ash
|
|
|