Add id properties to PointerEvent

services/ui/ws/window_manager_state.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 "services/ui/ws/window_manager_state.h"
 
 #include <utility>
 
 #include "base/memory/weak_ptr.h"
 #include "services/service_manager/public/interfaces/connector.mojom.h"
@@ skipping 27 matching lines @@
 }
 
 bool EventsCanBeCoalesced(const ui::Event& one, const ui::Event& two) {
   if (one.type() != two.type() || one.flags() != two.flags())
     return false;
 
   // TODO(sad): wheel events can also be merged.
   if (one.type() != ui::ET_POINTER_MOVED)
     return false;
 
-  return one.AsPointerEvent()->pointer_id() ==
-         two.AsPointerEvent()->pointer_id();
+  return one.AsPointerEvent()->pointer_details().id ==
+         two.AsPointerEvent()->pointer_details().id;
 }
 
 std::unique_ptr<ui::Event> CoalesceEvents(std::unique_ptr<ui::Event> first,
                                           std::unique_ptr<ui::Event> second) {
   DCHECK(first->type() == ui::ET_POINTER_MOVED)
       << " Non-move events cannot be merged yet.";
   // For mouse moves, the new event just replaces the old event.
   return second;
 }
 
@@ skipping 117 matching lines @@
 void WindowManagerState::SetDragDropSourceWindow(
     DragSource* drag_source,
     ServerWindow* window,
     DragTargetConnection* source_connection,
     const std::unordered_map<std::string, std::vector<uint8_t>>& drag_data,
     uint32_t drag_operation) {
   int32_t drag_pointer = PointerEvent::kMousePointerId;
   if (in_flight_event_details_ &&
       in_flight_event_details_->event->IsPointerEvent()) {
     drag_pointer =
-        in_flight_event_details_->event->AsPointerEvent()->pointer_id();
+        in_flight_event_details_->event->AsPointerEvent()->pointer_details().id;
   } else {
     NOTIMPLEMENTED() << "Set drag drop set up during something other than a "
                      << "pointer event; rejecting drag.";
     drag_source->OnDragCompleted(false, ui::mojom::kDropEffectNone);
     return;
   }
 
   event_dispatcher_.SetDragDropSourceWindow(drag_source, window,
                                             source_connection, drag_pointer,
                                             drag_data, drag_operation);
@@ skipping 467 matching lines @@
       window->RemoveObserver(this);
       orphaned_window_manager_display_roots_.erase(iter);
       return;
     }
   }
   NOTREACHED();
 }
 
 }  // namespace ws
 }  // namespace ui