Add id properties to PointerEvent

ui/chromeos/touch_accessibility_enabler.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/chromeos/touch_accessibility_enabler.h"
 
 #include <math.h>
 
 #include <utility>
 
@@ skipping 42 matching lines @@
   // Skip events rewritten by TouchExplorationController, it will hand
   // us the unrewritten events directly.
   if (!(event->flags() & ui::EF_TOUCH_ACCESSIBILITY))
     HandleTouchEvent(*event);
 }
 
 void TouchAccessibilityEnabler::HandleTouchEvent(const ui::TouchEvent& event) {
   DCHECK(!(event.flags() & ui::EF_TOUCH_ACCESSIBILITY));
   const ui::EventType type = event.type();
   const gfx::PointF& location = event.location_f();
-  const int touch_id = event.touch_id();
+  const int touch_id = event.pointer_details().id;
 
   if (type == ui::ET_TOUCH_PRESSED) {
     touch_locations_.insert(std::pair<int, gfx::PointF>(touch_id, location));
   } else if (type == ui::ET_TOUCH_RELEASED || type == ui::ET_TOUCH_CANCELLED) {
     auto iter = touch_locations_.find(touch_id);
 
     // Can happen if this object is constructed while fingers were down.
     if (iter == touch_locations_.end())
       return;
 
@@ skipping 75 matching lines @@
       tick_count < kTimerTicksToToggleSpokenFeedback) {
     delegate_->PlaySpokenFeedbackToggleCountdown(tick_count);
   }
   if (tick_count == kTimerTicksToToggleSpokenFeedback) {
     delegate_->ToggleSpokenFeedback();
     state_ = WAIT_FOR_NO_FINGERS;
   }
 }
 
 }  // namespace ui