Add id properties to PointerEvent

ash/touch/touch_hud_debug.cc

 // Copyright 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 "ash/touch/touch_hud_debug.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 75 matching lines @@
     return static_cast<int>(tracking_id);
   }
 #endif
   return 0;
 }
 
 // A TouchPointLog represents a single touch-event of a touch point.
 struct TouchPointLog {
  public:
   explicit TouchPointLog(const ui::TouchEvent& touch)
-      : id(touch.touch_id()),
+      : id(touch.pointer_details().id),
         type(touch.type()),
         location(touch.root_location()),
         timestamp((touch.time_stamp() - base::TimeTicks()).InMillisecondsF()),
         radius_x(touch.pointer_details().radius_x),
         radius_y(touch.pointer_details().radius_y),
         pressure(touch.pointer_details().force),
         tracking_id(GetTrackingId(touch)),
         source_device(touch.source_device_id()) {}
 
   // Populates a dictionary value with all the information about the touch
@@ skipping 99 matching lines @@
  private:
   void StartTrace(const ui::TouchEvent& touch) {
     // Find the first inactive spot; otherwise, overwrite the one
     // |next_trace_index_| is pointing to.
     int old_trace_index = next_trace_index_;
     do {
       if (!traces_[next_trace_index_].active())
         break;
       next_trace_index_ = (next_trace_index_ + 1) % kMaxPaths;
     } while (next_trace_index_ != old_trace_index);
-    int touch_id = touch.touch_id();
+    int touch_id = touch.pointer_details().id;
     traces_[next_trace_index_].Reset();
     touch_id_to_trace_index_[touch_id] = next_trace_index_;
     next_trace_index_ = (next_trace_index_ + 1) % kMaxPaths;
   }
 
   void AddToTrace(const ui::TouchEvent& touch) {
-    int touch_id = touch.touch_id();
+    int touch_id = touch.pointer_details().id;
     int trace_index = touch_id_to_trace_index_[touch_id];
     traces_[trace_index].AddTouchPoint(touch);
   }
 
   TouchTrace traces_[kMaxPaths];
   int next_trace_index_;
 
   std::map<int, int> touch_id_to_trace_index_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchLog);
@@ skipping 198 matching lines @@
   DCHECK(point != trace.log().rend());
   gfx::Point touch_position = point->location;
 
   std::string string = base::StringPrintf(
       "%2d: %s %s (%.4f)", index, GetTouchEventLabel(touch_status),
       touch_position.ToString().c_str(), touch_radius);
   touch_labels_[index]->SetText(base::UTF8ToUTF16(string));
 }
 
 void TouchHudDebug::OnTouchEvent(ui::TouchEvent* event) {
-  if (event->touch_id() >= kMaxTouchPoints)
+  if (static_cast<int>(event->pointer_details().id) >= kMaxTouchPoints)
     return;
 
   touch_log_->AddTouchPoint(*event);
-  canvas_->TouchPointAdded(event->touch_id());
-  UpdateTouchPointLabel(event->touch_id());
+  canvas_->TouchPointAdded(event->pointer_details().id);
+  UpdateTouchPointLabel(event->pointer_details().id);
   label_container_->SetSize(label_container_->GetPreferredSize());
 }
 
 void TouchHudDebug::OnDisplayMetricsChanged(const display::Display& display,
                                             uint32_t metrics) {
   TouchObserverHUD::OnDisplayMetricsChanged(display, metrics);
 
   if (display.id() != display_id() || !(metrics & DISPLAY_METRIC_BOUNDS))
     return;
   const gfx::Size& size = display.size();
   canvas_->SetSize(size);
   label_container_->SetY(size.height() / kReducedScale);
 }
 
 void TouchHudDebug::SetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(this);
 }
 
 void TouchHudDebug::UnsetHudForRootWindowController(
     RootWindowController* controller) {
   controller->set_touch_hud_debug(NULL);
 }
 
 }  // namespace ash