Add id properties to PointerEvent

mash/simple_wm/move_loop.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 "mash/simple_wm/move_loop.h"
 
 #include "base/auto_reset.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
@@ skipping 34 matching lines @@
   VerticalLocation v_loc;
   if (!DetermineType(ht_location, &type, &h_loc, &v_loc))
     return nullptr;
 
   return base::WrapUnique(new MoveLoop(target, event, type, h_loc, v_loc));
 }
 
 MoveLoop::MoveResult MoveLoop::Move(const ui::PointerEvent& event) {
   switch (event.type()) {
     case ui::ET_POINTER_CANCELLED:
-      if (event.pointer_id() == pointer_id_) {
+      if (event.pointer_details().id == pointer_id_) {
         if (target_)
           Revert();
         return MoveResult::DONE;
       }
       return MoveResult::CONTINUE;
 
     case ui::ET_POINTER_MOVED:
-      if (target_ && event.pointer_id() == pointer_id_)
+      if (target_ && event.pointer_details().id == pointer_id_)
         MoveImpl(event);
       return MoveResult::CONTINUE;
 
     case ui::ET_POINTER_UP:
-      if (event.pointer_id() == pointer_id_) {
+      if (event.pointer_details().id == pointer_id_) {
         // TODO(sky): need to support changed_flags.
         if (target_)
           MoveImpl(event);
         return MoveResult::DONE;
       }
       return MoveResult::CONTINUE;
 
     default:
       break;
   }
   return MoveResult::CONTINUE;
 }
 
 void MoveLoop::Revert() {
   if (!target_)
     return;
 
   base::AutoReset<bool> resetter(&changing_bounds_, true);
   target_->SetBounds(initial_window_bounds_);
-  //SetWindowUserSetBounds(target_, initial_user_set_bounds_);
 }
 
 MoveLoop::MoveLoop(aura::Window* target,
                    const ui::PointerEvent& event,
                    Type type,
                    HorizontalLocation h_loc,
                    VerticalLocation v_loc)
     : target_(target),
       type_(type),
       h_loc_(h_loc),
       v_loc_(v_loc),
-      pointer_id_(event.pointer_id()),
+      pointer_id_(event.pointer_details().id),
       initial_event_screen_location_(event.root_location()),
       initial_window_bounds_(target->bounds()),
       initial_user_set_bounds_(target->bounds()),
-          // GetWindowUserSetBounds(target)),
       changing_bounds_(false) {
   target->AddObserver(this);
 }
 
 // static
 bool MoveLoop::DetermineType(int ht_location,
                              Type* type,
                              HorizontalLocation* h_loc,
                              VerticalLocation* v_loc) {
   *h_loc = HorizontalLocation::OTHER;
@@ skipping 59 matching lines @@
     //             need to take some action to recenter the window relative to
     //             the pointer position within the titlebar.
     initial_window_bounds_.set_width(restored_bounds.width());
     initial_window_bounds_.set_height(restored_bounds.height());
   }
   const gfx::Vector2d delta =
       event.root_location() - initial_event_screen_location_;
   const gfx::Rect new_bounds(DetermineBoundsFromDelta(delta));
   base::AutoReset<bool> resetter(&changing_bounds_, true);
   target_->SetBounds(new_bounds);
-  //SetWindowUserSetBounds(target_, new_bounds);
 }
 
 void MoveLoop::Cancel() {
   target_->RemoveObserver(this);
   target_ = nullptr;
 }
 
 gfx::Rect MoveLoop::DetermineBoundsFromDelta(const gfx::Vector2d& delta) {
   if (type_ == Type::MOVE) {
     return gfx::Rect(initial_window_bounds_.origin() + delta,
@@ skipping 36 matching lines @@
   if (!changing_bounds_)
     Cancel();
 }
 
 void MoveLoop::OnWindowVisibilityChanged(aura::Window* window, bool visible) {
   DCHECK_EQ(window, target_);
   Cancel();
 }
 
 }  // namespace simple_wm