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

Unified Diff: ash/display/mouse_cursor_event_filter.cc

Issue 567413003: Revert of Remove deprecated cursor event filter for Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/mouse_cursor_event_filter.h ('k') | ash/display/mouse_cursor_event_filter_ozone.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8f053172480f6885ba7d2efb566f7c39bc6e834a..14a6913e925a7056ccecb8c4a942c73f8a274326 100644
--- a/ash/display/mouse_cursor_event_filter.cc
+++ b/ash/display/mouse_cursor_event_filter.cc
@@ -152,6 +152,7 @@
OnDisplayConfigurationChanged();
}
+#if !defined(USE_OZONE)
void MouseCursorEventFilter::OnDisplayConfigurationChanged() {
// Extra check for |num_connected_displays()| is for SystemDisplayApiTest
// that injects MockScreen.
@@ -173,6 +174,7 @@
else
UpdateVerticalEdgeBounds();
}
+#endif
void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
@@ -222,6 +224,7 @@
root->GetHost()->MoveCursorToHostLocation(point_in_host);
}
+#if !defined(USE_OZONE)
bool MouseCursorEventFilter::WarpMouseCursorIfNecessary(ui::MouseEvent* event) {
if (!event->HasNativeEvent())
return false;
@@ -260,6 +263,7 @@
return true;
}
+#endif
void MouseCursorEventFilter::UpdateHorizontalEdgeBounds() {
bool from_primary = Shell::GetPrimaryRootWindow() == drag_source_root_;
@@ -370,6 +374,7 @@
*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) {
@@ -378,5 +383,6 @@
target_root->GetHost()->ConvertPointToNativeScreen(&native);
return WarpMouseCursorInNativeCoords(native, point_in_screen);
}
+#endif
} // namespace ash
« no previous file with comments | « ash/display/mouse_cursor_event_filter.h ('k') | ash/display/mouse_cursor_event_filter_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698