Remove ID from ui::PointerEvent's constructors

services/ui/ws/event_dispatcher.cc

 // Copyright 2015 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 "services/ui/ws/event_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
@@ skipping 447 matching lines @@
     // Down going to up is handled by ProcessLocatedEvent().
     if (pointer_target.is_pointer_down)
       pointer_targets_[pointer_id].is_pointer_down = true;
     return;
   }
 
   // The targets are changing. Send an exit if appropriate.
   if (event.IsMousePointerEvent()) {
     ui::PointerEvent exit_event(
         ui::ET_POINTER_EXITED, event.location(), event.root_location(),
-        event.flags(), ui::PointerEvent::kMousePointerId,
-        0 /* changed_button_flags */,
-        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+        event.flags(), 0 /* changed_button_flags */,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE,
+                           ui::PointerEvent::kMousePointerId),
         event.time_stamp());
     DispatchToPointerTarget(pointer_targets_[pointer_id], exit_event);
   }
 
   // Technically we're updating in place, but calling start then stop makes for
   // simpler code.
   StopTrackingPointer(pointer_id);
   StartTrackingPointer(pointer_id, pointer_target);
 }
 
@@ skipping 130 matching lines @@
 
     ui::EventType event_type = pair.second.is_mouse_event
                                    ? ui::ET_POINTER_EXITED
                                    : ui::ET_POINTER_CANCELLED;
     ui::EventPointerType pointer_type =
         pair.second.is_mouse_event ? ui::EventPointerType::POINTER_TYPE_MOUSE
                                    : ui::EventPointerType::POINTER_TYPE_TOUCH;
     // TODO(jonross): Track previous location in PointerTarget for sending
     // cancels.
     ui::PointerEvent event(event_type, gfx::Point(), gfx::Point(), ui::EF_NONE,
-                           pair.first, 0 /* changed_button_flags */,
-                           ui::PointerDetails(pointer_type),
+                           0 /* changed_button_flags */,
+                           ui::PointerDetails(pointer_type, pair.first),
                            ui::EventTimeForNow());
     DispatchToPointerTarget(pair.second, event);
   }
   pointer_targets_.clear();
 }
 
 void EventDispatcher::OnWillChangeWindowHierarchy(ServerWindow* window,
                                                   ServerWindow* new_parent,
                                                   ServerWindow* old_parent) {
   // TODO(sky): moving to a different root likely needs to transfer capture.
@@ skipping 20 matching lines @@
   if (mouse_cursor_source_window_ == window)
     SetMouseCursorSourceWindow(nullptr);
 }
 
 void EventDispatcher::OnDragCursorUpdated() {
   delegate_->UpdateNativeCursorFromDispatcher();
 }
 
 }  // namespace ws
 }  // namespace ui