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

Unified Diff: ui/views/mus/window_manager_connection.cc

Issue 1949823002: WIP: Eliminate event.target() usage from TrayEventFilter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: container delegate Created 4 years, 7 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/views/mus/window_manager_connection.h ('k') | ui/views/mus/window_manager_connection_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/window_manager_connection.cc
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index f52771ad4d01ac89d58e7b4cfd6f50dcf773cec5..4e7e4e44b8ccf8c12d01518c49a4a5c0dfb119cc 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -142,9 +142,19 @@ void WindowManagerConnection::OnEmbed(mus::Window* root) {}
void WindowManagerConnection::OnConnectionLost(
mus::WindowTreeConnection* connection) {}
-void WindowManagerConnection::OnEventObserved(const ui::Event& event) {
+void WindowManagerConnection::OnEventObserved(const ui::Event& event,
+ mus::Window* target) {
if (!event.IsLocatedEvent())
return;
+ Widget* target_widget = nullptr;
+ if (target) {
+ mus::Window* root = target->GetRoot();
+ target_widget = NativeWidgetMus::GetWidgetForWindow(root);
+ LOG(ERROR) << "JAMES target_widget " << target_widget->GetName();
+ } else {
+ LOG(ERROR) << "JAMES no target";
+ }
+
// The mojo input events type converter uses the event root_location field
// to store screen coordinates. Screen coordinates really should be returned
// separately. See http://crbug.com/608547
@@ -152,11 +162,11 @@ void WindowManagerConnection::OnEventObserved(const ui::Event& event) {
if (event.type() == ui::ET_MOUSE_PRESSED) {
FOR_EACH_OBSERVER(
PointerWatcher, pointer_watchers_,
- OnMousePressed(*event.AsMouseEvent(), location_in_screen));
+ OnMousePressed(*event.AsMouseEvent(), location_in_screen, target_widget));
} else if (event.type() == ui::ET_TOUCH_PRESSED) {
FOR_EACH_OBSERVER(
PointerWatcher, pointer_watchers_,
- OnTouchPressed(*event.AsTouchEvent(), location_in_screen));
+ OnTouchPressed(*event.AsTouchEvent(), location_in_screen, target_widget));
}
}
« no previous file with comments | « ui/views/mus/window_manager_connection.h ('k') | ui/views/mus/window_manager_connection_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698