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

Unified Diff: ui/views/widget/desktop_aura/x11_window_event_filter.cc

Issue 13902003: Remove Event::system_location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « ui/base/events/event.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/widget/desktop_aura/x11_window_event_filter.cc
diff --git a/ui/views/widget/desktop_aura/x11_window_event_filter.cc b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
index b5c3cf2ec1bc62f598b364692eef995cf315293b..dcf62df20893fd7d5e135f521b8891077d6d8f90 100644
--- a/ui/views/widget/desktop_aura/x11_window_event_filter.cc
+++ b/ui/views/widget/desktop_aura/x11_window_event_filter.cc
@@ -13,6 +13,7 @@
#include "ui/aura/root_window.h"
#include "ui/aura/window_delegate.h"
#include "ui/base/events/event.h"
+#include "ui/base/events/event_utils.h"
#include "ui/base/hit_test.h"
#include "ui/views/widget/desktop_aura/desktop_activation_client.h"
#include "ui/views/widget/native_widget_aura.h"
@@ -102,9 +103,12 @@ void X11WindowEventFilter::OnMouseEvent(ui::MouseEvent* event) {
return;
// Get the |x_root_window_| location out of the native event.
- gfx::Point root_location = event->system_location();
- if (DispatchHostWindowDragMovement(component, root_location))
- event->StopPropagation();
+ if (event->native_event()) {
+ const gfx::Point x_root_location =
+ ui::EventSystemLocationFromNative(event->native_event());
+ if (DispatchHostWindowDragMovement(component, x_root_location))
+ event->StopPropagation();
+ }
}
bool X11WindowEventFilter::DispatchHostWindowDragMovement(
@@ -170,4 +174,3 @@ bool X11WindowEventFilter::DispatchHostWindowDragMovement(
}
} // namespace views
-
« no previous file with comments | « ui/base/events/event.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698