Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients.

ui/aura/mus/capture_synchronizer.h

Index: ui/aura/mus/capture_synchronizer.h
diff --git a/ui/aura/mus/capture_synchronizer.h b/ui/aura/mus/capture_synchronizer.h
index 87bce872168d8c50d69ab3361b1d2643d8affb9b..73b4c1f62faea8e02213ce760e8612b7a0b761bf 100644
--- a/ui/aura/mus/capture_synchronizer.h
+++ b/ui/aura/mus/capture_synchronizer.h
@@ -32,8 +32,7 @@ class CaptureSynchronizer : public WindowObserver,
                             public client::CaptureClientObserver {
  public:
   CaptureSynchronizer(CaptureSynchronizerDelegate* delegate,
-                      ui::mojom::WindowTree* window_tree,
-                      client::CaptureClient* capture_client);
+                      ui::mojom::WindowTree* window_tree);
   ~CaptureSynchronizer() override;
 
   WindowMus* capture_window() { return capture_window_; }
@@ -41,6 +40,8 @@ class CaptureSynchronizer : public WindowObserver,
   // Called when the server side wants to change capture to |window|.
   void SetCaptureFromServer(WindowMus* window);
 
+  void Attach(client::CaptureClient* capture_client);

[sadrul, 2017/01/21 03:23:37]

Document.

[riajiang, 2017/01/24 19:36:22]

Moved this functionality into WindowTreeClient.

+
  private:
   // Internal implementation for capture changes. Adds/removes observer as
   // necessary and sets |capture_window_| to |window|.
@@ -54,7 +55,6 @@ class CaptureSynchronizer : public WindowObserver,
 
   CaptureSynchronizerDelegate* delegate_;
   ui::mojom::WindowTree* window_tree_;
-  client::CaptureClient* capture_client_;
 
   // Window that currently has capture.
   WindowMus* capture_window_ = nullptr;