Converts some services to use aura-mus

ui/views/mus/pointer_watcher_event_router2.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/mus/pointer_watcher_event_router2.h"
 
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
@@ skipping 72 matching lines @@
       // events. This could only happen if there is a bug in the add logic.
       NOTREACHED();
       break;
   }
 }
 
 void PointerWatcherEventRouter2::OnPointerEventObserved(
     const ui::PointerEvent& event,
     aura::Window* target) {
   Widget* target_widget = nullptr;
+  ui::PointerEvent updated_event(event);
   if (target) {
     aura::Window* window = target;
     while (window && !target_widget) {
       target_widget = Widget::GetWidgetForNativeView(window);
       if (!target_widget) {
         // Widget::GetWidgetForNativeView() uses NativeWidgetAura. Views with
         // aura-mus may also create DesktopNativeWidgetAura.
         DesktopNativeWidgetAura* desktop_native_widget_aura =
             DesktopNativeWidgetAura::ForWindow(target);
         if (desktop_native_widget_aura) {
           target_widget = static_cast<internal::NativeWidgetPrivate*>(
                               desktop_native_widget_aura)
                               ->GetWidget();
         }
       }
       window = window->parent();
     }
+    if (target_widget) {
+      gfx::Point widget_relative_location(event.location());
+      aura::Window::ConvertPointToTarget(target, target_widget->GetNativeView(),
+                                         &widget_relative_location);
+      updated_event.set_location(widget_relative_location);
+    }
   }
 
   // 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
-  gfx::Point location_in_screen = event.AsLocatedEvent()->root_location();
-  for (PointerWatcher& observer : move_watchers_)
-    observer.OnPointerEventObserved(event, location_in_screen, target_widget);
+  gfx::Point location_in_screen = event.root_location();
+  for (PointerWatcher& observer : move_watchers_) {
+    observer.OnPointerEventObserved(updated_event, location_in_screen,
+                                    target_widget);
+  }
   if (event.type() != ui::ET_POINTER_MOVED) {
-    for (PointerWatcher& observer : non_move_watchers_)
-      observer.OnPointerEventObserved(event, location_in_screen, target_widget);
+    for (PointerWatcher& observer : non_move_watchers_) {
+      observer.OnPointerEventObserved(updated_event, location_in_screen,
+                                      target_widget);
+    }
   }
 }
 
 PointerWatcherEventRouter2::EventTypes
 PointerWatcherEventRouter2::DetermineEventTypes() {
   if (HasPointerWatcher(&move_watchers_))
     return EventTypes::MOVE_EVENTS;
 
   if (HasPointerWatcher(&non_move_watchers_))
     return EventTypes::NON_MOVE_EVENTS;
@@ skipping 19 matching lines @@
     aura::WindowTreeClient* client) {
   // We expect that all observers have been removed by this time.
   DCHECK_EQ(event_types_, EventTypes::NONE);
   DCHECK_EQ(client, window_tree_client_);
   window_tree_client_->GetCaptureClient()->RemoveObserver(this);
   window_tree_client_->RemoveObserver(this);
   window_tree_client_ = nullptr;
 }
 
 }  // namespace views