Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ash/mus/window_manager.cc

 // 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.
 
 #include "ash/mus/window_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 23 matching lines @@
 #include "ash/wm/window_properties.h"
 #include "base/memory/ptr_util.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/ui/common/accelerator_util.h"
 #include "services/ui/common/types.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 "ui/aura/client/window_parenting_client.h"
 #include "ui/aura/env.h"
-#include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/property_converter.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
 #include "ui/aura/window.h"
 #include "ui/base/class_property.h"
 #include "ui/base/hit_test.h"
 #include "ui/display/display_observer.h"
 #include "ui/events/mojo/event.mojom.h"
 #include "ui/views/mus/pointer_watcher_event_router.h"
 #include "ui/views/mus/screen_mus.h"
@@ skipping 53 matching lines @@
   const gfx::Insets client_area_insets =
       NonClientFrameController::GetPreferredClientAreaInsets();
   frame_decoration_values->normal_client_area_insets = client_area_insets;
   frame_decoration_values->maximized_client_area_insets = client_area_insets;
   frame_decoration_values->max_title_bar_button_width =
       NonClientFrameController::GetMaxTitleBarButtonWidth();
   window_manager_client_->SetFrameDecorationValues(
       std::move(frame_decoration_values));
 
   lookup_.reset(new WmLookupMus);
-
-  // Notify PointerWatcherEventRouter and CaptureSynchronizer that the capture
-  // client has been set.
-  aura::client::CaptureClient* capture_client = wm_state_->capture_controller();
-  pointer_watcher_event_router_->AttachToCaptureClient(capture_client);
-  window_tree_client_->capture_synchronizer()->AttachToCaptureClient(
-      capture_client);
 }
 
 void WindowManager::DeleteAllRootWindowControllers() {
   // Primary RootWindowController must be destroyed last.
   RootWindowController* primary_root_window_controller =
       GetPrimaryRootWindowController();
   std::set<RootWindowController*> secondary_root_window_controllers;
   for (auto& root_window_controller_ptr : root_window_controllers_) {
     if (root_window_controller_ptr.get() != primary_root_window_controller) {
       secondary_root_window_controllers.insert(
@@ skipping 104 matching lines @@
       root_window_controllers_.erase(iter);
       break;
     }
   }
 }
 
 void WindowManager::Shutdown() {
   if (!window_tree_client_)
     return;
 
-  aura::client::CaptureClient* capture_client = wm_state_->capture_controller();
-  pointer_watcher_event_router_->DetachFromCaptureClient(capture_client);
-  window_tree_client_->capture_synchronizer()->DetachFromCaptureClient(
-      capture_client);
-
   Shell::DeleteInstance();
 
   lookup_.reset();
   shadow_controller_.reset();
 
   pointer_watcher_event_router_.reset();
 
   window_tree_client_.reset();
   window_manager_client_ = nullptr;
 }
@@ skipping 204 matching lines @@
 bool WindowManager::IsWindowActive(aura::Window* window) {
   return Shell::GetInstance()->activation_client()->GetActiveWindow() == window;
 }
 
 void WindowManager::OnWmDeactivateWindow(aura::Window* window) {
   Shell::GetInstance()->activation_client()->DeactivateWindow(window);
 }
 
 }  // namespace mus
 }  // namespace ash