Updates PointerEventRouter to handle switching move type

services/ui/public/cpp/window_tree_client.h

 // Copyright 2014 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 293 matching lines @@
   void OnWindowOpacityChanged(Id window_id,
                               float old_opacity,
                               float new_opacity) override;
   void OnWindowParentDrawnStateChanged(Id window_id, bool drawn) override;
   void OnWindowSharedPropertyChanged(Id window_id,
                                      const mojo::String& name,
                                      mojo::Array<uint8_t> new_data) override;
   void OnWindowInputEvent(uint32_t event_id,
                           Id window_id,
                           std::unique_ptr<ui::Event> event,
-                          uint32_t pointer_watcher_id) override;
+                          bool matches_pointer_watcher) override;
   void OnPointerEventObserved(std::unique_ptr<ui::Event> event,
-                              uint32_t pointer_watcher_id,
                               uint32_t window_id) override;
   void OnWindowFocused(Id focused_window_id) override;
   void OnWindowPredefinedCursorChanged(Id window_id,
                                        mojom::Cursor cursor) override;
   void OnChangeCompleted(uint32_t change_id, bool success) override;
   void RequestClose(uint32_t window_id) override;
   void GetWindowManager(
       mojo::AssociatedInterfaceRequest<WindowManager> internal) override;
 
   // Overridden from WindowManager:
@@ skipping 85 matching lines @@
   mojo::ScopedSharedBufferMapping cursor_location_mapping_;
 
   base::ObserverList<WindowTreeClientObserver> observers_;
 
   std::unique_ptr<mojo::AssociatedBinding<mojom::WindowManager>>
       window_manager_internal_;
   mojom::WindowManagerClientAssociatedPtr window_manager_internal_client_;
 
   bool has_pointer_watcher_ = false;
 
-  // Monotonically increasing ID for pointer watchers.
-  uint32_t pointer_watcher_id_ = 0u;
-
   // The current change id for the client.
   uint32_t current_move_loop_change_ = 0u;
 
   // The current change id for the window manager.
   uint32_t current_wm_move_loop_change_ = 0u;
   Id current_wm_move_loop_window_id_ = 0u;
 
   // Callback executed when a move loop initiated by PerformWindowMove() is
   // completed.
   base::Callback<void(bool)> on_current_move_finished_;
 
   base::WeakPtrFactory<WindowTreeClient> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClient);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_TREE_CLIENT_H_