mus: Change PointerWatcher to observe all pointer events, with moves optional.

services/ui/public/cpp/tests/window_tree_client_private.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_
 #define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 17 matching lines @@
 class Window;
 class WindowTreeClient;
 
 // Use to access implementation details of WindowTreeClient.
 class WindowTreeClientPrivate {
  public:
   explicit WindowTreeClientPrivate(WindowTreeClient* tree_client_impl);
   explicit WindowTreeClientPrivate(Window* window);
   ~WindowTreeClientPrivate();
 
-  uint32_t event_observer_id();
+  uint32_t pointer_watcher_id();
 
   // Calls OnEmbed() on the WindowTreeClient.
   void OnEmbed(mojom::WindowTree* window_tree);
 
   void CallWmNewDisplayAdded(const display::Display& display);
 
   // Pretends that |event| has been received from the window server.
   void CallOnWindowInputEvent(Window* window, std::unique_ptr<ui::Event> event);
 
   // Sets the WindowTree and client id.
   void SetTreeAndClientId(mojom::WindowTree* window_tree,
                           ClientSpecificId client_id);
 
  private:
    WindowTreeClient* tree_client_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientPrivate);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_TREE_CLIENT_PRIVATE_H_