Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients.

ui/aura/mus/window_tree_client.cc

 // 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.
 
 #include "ui/aura/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/constants.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "ui/aura/client/aura_constants.h"
+#include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/drag_drop_controller_mus.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/in_flight_change.h"
 #include "ui/aura/mus/input_method_mus.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/property_utils.h"
 #include "ui/aura/mus/window_manager_delegate.h"
@@ skipping 184 matching lines @@
   ui::mojom::WindowManagerWindowTreeFactoryPtr factory;
   connector_->BindInterface(ui::mojom::kServiceName, &factory);
   ui::mojom::WindowTreePtr window_tree;
   factory->CreateWindowTree(MakeRequest(&window_tree),
                             binding_.CreateInterfacePtrAndBind());
   SetWindowTree(std::move(window_tree));
 }
 
 client::CaptureClient* WindowTreeClient::GetCaptureClient() {
   return delegate_->GetCaptureClient();
 }

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

Remove this (and WindowTreeClientDelegate::GetCaptureClient()).

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

Removed these two and updated use cases.

 
 void WindowTreeClient::SetCanFocus(Window* window, bool can_focus) {
   DCHECK(tree_);
   DCHECK(window);
   tree_->SetCanFocus(WindowMus::Get(window)->server_id(), can_focus);
 }
 
 void WindowTreeClient::SetPredefinedCursor(WindowMus* window,
                                            ui::mojom::Cursor old_cursor,
                                            ui::mojom::Cursor new_cursor) {
@@ skipping 207 matching lines @@
     tree_ptr_->GetWindowManagerClient(MakeRequest(
         &window_manager_internal_client_, tree_ptr_.associated_group()));
   }
 }
 
 void WindowTreeClient::WindowTreeConnectionEstablished(
     ui::mojom::WindowTree* window_tree) {
   tree_ = window_tree;
 
   drag_drop_controller_ = base::MakeUnique<DragDropControllerMus>(this, tree_);
-  capture_synchronizer_ =
-      base::MakeUnique<CaptureSynchronizer>(this, tree_, GetCaptureClient());
+  capture_synchronizer_ = base::MakeUnique<CaptureSynchronizer>(this, tree_);
   focus_synchronizer_ = base::MakeUnique<FocusSynchronizer>(this, tree_);
 }
 
 void WindowTreeClient::OnConnectionLost() {
   delegate_->OnLostConnection(this);
 }
 
 bool WindowTreeClient::HandleInternalPropertyChanged(WindowMus* window,
                                                      const void* key) {
-  if (key != client::kModalKey)
+  if (key != client::kModalKey && key != client::kRootWindowCaptureClientKey)
     return false;
 
+  if (key == client::kRootWindowCaptureClientKey) {
+    capture_synchronizer_->Attach(
+        client::GetCaptureClient(window->GetWindow()));
+    return true;
+  }
+
   if (window->GetWindow()->GetProperty(client::kModalKey) ==
       ui::MODAL_TYPE_NONE) {
     // TODO: shouldn't early return, but explicitly tell server to turn off
     // modality. http://crbug.com/660073.
     return true;
   }
 
   const uint32_t change_id =
       ScheduleInFlightChange(base::MakeUnique<InFlightSetModalChange>(window));
   // TODO: this is subtly different that explicitly specifying a type.
@@ skipping 1237 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura