Add id properties to PointerEvent

ash/touch_hud/touch_hud_renderer.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_hud/touch_hud_renderer.h"
 
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_owner.h"
 #include "ui/events/event.h"
@@ skipping 127 matching lines @@
 void TouchHudRenderer::Clear() {
   for (std::map<int, TouchPointView*>::iterator iter = points_.begin();
        iter != points_.end(); iter++)
     iter->second->Destroy();
   points_.clear();
 }
 
 void TouchHudRenderer::HandleTouchEvent(const ui::LocatedEvent& event) {
   int id = 0;
   if (event.IsTouchEvent()) {
-    id = event.AsTouchEvent()->touch_id();
+    id = event.AsTouchEvent()->pointer_details().id;
   } else {
     DCHECK(event.IsPointerEvent());
     DCHECK(event.AsPointerEvent()->pointer_details().pointer_type ==
            ui::EventPointerType::POINTER_TYPE_TOUCH);
-    id = event.AsPointerEvent()->pointer_id();
+    id = event.AsPointerEvent()->pointer_details().id;
   }
   if (event.type() == ui::ET_TOUCH_PRESSED ||
       event.type() == ui::ET_POINTER_DOWN) {
     TouchPointView* point = new TouchPointView(parent_widget_);
     point->UpdateTouch(event);
     std::pair<std::map<int, TouchPointView*>::iterator, bool> result =
         points_.insert(std::make_pair(id, point));
     // If a |TouchPointView| is already mapped to the touch id, destroy it and
     // replace it with the new one.
     if (!result.second) {
       result.first->second->Destroy();
       result.first->second = point;
     }
   } else {
     std::map<int, TouchPointView*>::iterator iter = points_.find(id);
     if (iter != points_.end()) {
       iter->second->UpdateTouch(event);
       if (event.type() == ui::ET_TOUCH_RELEASED ||
           event.type() == ui::ET_TOUCH_CANCELLED ||
           event.type() == ui::ET_POINTER_UP ||
           event.type() == ui::ET_POINTER_CANCELLED)
         points_.erase(iter);
     }
   }
 }
 
 }  // namespace ash