Revert: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient()

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 275 matching lines @@
   Shutdown();
   // TODO(sky): this case should trigger shutting down WindowManagerApplication
   // too.
 }
 
 void WindowManager::OnPointerEventObserved(const ui::PointerEvent& event,
                                            aura::Window* target) {
   pointer_watcher_event_router_->OnPointerEventObserved(event, target);
 }
 
+aura::client::CaptureClient* WindowManager::GetCaptureClient() {
+  return wm_state_->capture_controller();
+}
+
 aura::PropertyConverter* WindowManager::GetPropertyConverter() {
   return property_converter_.get();
 }
 
 void WindowManager::SetWindowManagerClient(aura::WindowManagerClient* client) {
   window_manager_client_ = client;
   ash::Shell::set_window_manager_client(client);
 }
 
 bool WindowManager::OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) {
@@ skipping 158 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