mus: Change PointerWatcher to watch for all events.

ui/views/mus/window_manager_connection.h

 // Copyright 2015 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 UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
 #define UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "ui/views/mus/mus_export.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace shell {
 class Connector;
 }
 
 namespace views {
 class ClipboardMus;
 class NativeWidget;
+class PointerEventWatcher;
 class PointerWatcher;
-class TouchEventWatcher;
 class ScreenMus;
 namespace internal {
 class NativeWidgetDelegate;
 }
 
 // Provides configuration to mus in views. This consists of the following:
 // . Provides a Screen implementation backed by mus.
 // . Provides a Clipboard implementation backed by mus.
 // . Creates and owns a WindowTreeClient.
 // . Registers itself as the factory for creating NativeWidgets so that a
@@ skipping 16 matching lines @@
   shell::Connector* connector() { return connector_; }
 
   ui::Window* NewWindow(
       const std::map<std::string, std::vector<uint8_t>>& properties);
 
   NativeWidget* CreateNativeWidgetMus(
       const std::map<std::string, std::vector<uint8_t>>& properties,
       const Widget::InitParams& init_params,
       internal::NativeWidgetDelegate* delegate);
 
   void AddPointerWatcher(PointerWatcher* watcher);

[sadrul, 2016/07/19 00:18:03]

Rename to AddPointerDownWatcher(PointerDownWatcher*)

[riajiang, 2016/07/19 18:46:34]

Will do the renaming in another cl.

   void RemovePointerWatcher(PointerWatcher* watcher);
 
-  void AddTouchEventWatcher(TouchEventWatcher* watcher);
-  void RemoveTouchEventWatcher(TouchEventWatcher* watcher);
+  void AddTouchEventWatcher(PointerEventWatcher* watcher);
+  void RemoveTouchEventWatcher(PointerEventWatcher* watcher);
+
+  void AddMouseEventWatcher(PointerEventWatcher* watcher);
+  void RemoveMouseEventWatcher(PointerEventWatcher* watcher);

[sadrul, 2016/07/19 00:18:03]

Hm, I don't like having two separate methods for install PointerEventWatchers.
Can we instead have a single AddPointerEventWatcher(watcher,
ui::EventPointerType) instead?

[riajiang, 2016/07/19 18:46:34]

Done.

 
   const std::set<ui::Window*>& GetRoots() const;
 
  private:
   friend class WindowManagerConnectionTest;
 
   WindowManagerConnection(shell::Connector* connector,
                           const shell::Identity& identity);
 
   // Returns true if there is one or more watchers for this client.
   bool HasPointerWatcher();
   bool HasTouchEventWatcher();
+  bool HasMouseEventWatcher();
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
   void OnDidDestroyClient(ui::WindowTreeClient* client) override;
   void OnEventObserved(const ui::Event& event, ui::Window* target) override;
 
   // ScreenMusDelegate:
   void OnWindowManagerFrameValuesChanged() override;
   gfx::Point GetCursorScreenPoint() override;
 
   shell::Connector* connector_;
   shell::Identity identity_;
   std::unique_ptr<ScreenMus> screen_;
   std::unique_ptr<ui::WindowTreeClient> client_;
   // Must be empty on destruction.
   base::ObserverList<PointerWatcher, true> pointer_watchers_;
-  base::ObserverList<TouchEventWatcher, true> touch_event_watchers_;
+  base::ObserverList<PointerEventWatcher, true> touch_event_watchers_;
+  base::ObserverList<PointerEventWatcher, true> mouse_event_watchers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_WINDOW_MANAGER_CONNECTION_H_