Add id properties to PointerEvent

ui/events/events_default.cc

 // Copyright (c) 2013 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/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 
 namespace ui {
 
@@ skipping 35 matching lines @@
       static_cast<const ui::MouseEvent*>(native_event);
   DCHECK(event->IsMouseEvent() || event->IsScrollEvent());
   return event->changed_button_flags();
 }
 
 PointerDetails GetMousePointerDetailsFromNative(
     const base::NativeEvent& native_event) {
   const ui::MouseEvent* event =
       static_cast<const ui::MouseEvent*>(native_event);
   DCHECK(event->IsMouseEvent() || event->IsScrollEvent());
-  return event->pointer_details();
+  PointerDetails pointer_detail = event->pointer_details();
+  pointer_detail.id = PointerEvent::kMousePointerId;
+  return pointer_detail;
 }
 
 KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
   const ui::KeyEvent* event = static_cast<const ui::KeyEvent*>(native_event);
   DCHECK(event->IsKeyEvent());
   return event->key_code();
 }
 
 DomCode CodeFromNative(const base::NativeEvent& native_event) {
   const ui::KeyEvent* event = static_cast<const ui::KeyEvent*>(native_event);
@@ skipping 17 matching lines @@
 base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) {
   return NULL;
 }
 
 void ReleaseCopiedNativeEvent(const base::NativeEvent& event) {
 }
 
 void ClearTouchIdIfReleased(const base::NativeEvent& xev) {
 }
 
+// TODO(687724): Will remove all GetTouchId functions.
 int GetTouchId(const base::NativeEvent& native_event) {
   const ui::TouchEvent* event =
       static_cast<const ui::TouchEvent*>(native_event);
   DCHECK(event->IsTouchEvent());
-  return event->touch_id();
+  return event->pointer_details().id;
 }
 
 PointerDetails GetTouchPointerDetailsFromNative(
     const base::NativeEvent& native_event) {
   const ui::TouchEvent* event =
       static_cast<const ui::TouchEvent*>(native_event);
   DCHECK(event->IsTouchEvent());
   return event->pointer_details();
 }
 
@@ skipping 47 matching lines @@
     *vx_ordinal = event->x_offset_ordinal();
   if (vy_ordinal)
     *vy_ordinal = event->y_offset_ordinal();
   if (is_cancel)
     *is_cancel = event->type() == ET_SCROLL_FLING_CANCEL;
 
   return true;
 }
 
 }  // namespace ui