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

ui/views/mus/mus_client.cc

 // Copyright 2016 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/views/mus/mus_client.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread.h"
 #include "components/discardable_memory/client/client_discardable_shared_memory_manager.h"
@@ skipping 15 matching lines @@
 #include "ui/aura/window_tree_host.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/clipboard_mus.h"
 #include "ui/views/mus/desktop_window_tree_host_mus.h"
 #include "ui/views/mus/mus_property_mirror.h"
 #include "ui/views/mus/pointer_watcher_event_router.h"
 #include "ui/views/mus/screen_mus.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "ui/wm/core/capture_controller.h"
 #include "ui/wm/core/wm_state.h"
 
 // Widget::InitParams::Type must match that of ui::mojom::WindowType.
 #define WINDOW_TYPES_MATCH(NAME)                                      \
   static_assert(                                                      \
       static_cast<int32_t>(views::Widget::InitParams::TYPE_##NAME) == \
           static_cast<int32_t>(ui::mojom::WindowType::NAME),          \
       "Window type constants must match")
 
 WINDOW_TYPES_MATCH(WINDOW);
@@ skipping 218 matching lines @@
 void MusClient::OnPointerEventObserved(const ui::PointerEvent& event,
                                        aura::Window* target) {
   pointer_watcher_event_router_->OnPointerEventObserved(event, target);
 }
 
 void MusClient::OnWindowManagerFrameValuesChanged() {
   for (auto& observer : observer_list_)
     observer.OnWindowManagerFrameValuesChanged();
 }
 
+aura::client::CaptureClient* MusClient::GetCaptureClient() {
+  return wm::CaptureController::Get();
+}
+
 aura::PropertyConverter* MusClient::GetPropertyConverter() {
   return property_converter_.get();
 }
 
 aura::Window* MusClient::GetWindowAtScreenPoint(const gfx::Point& point) {
   for (aura::Window* root : window_tree_client_->GetRoots()) {
     aura::WindowTreeHost* window_tree_host = root->GetHost();
     if (!window_tree_host)
       continue;
     // TODO: this likely gets z-order wrong. http://crbug.com/663606.
     gfx::Point relative_point(point);
     window_tree_host->ConvertScreenInPixelsToDIP(&relative_point);
     if (gfx::Rect(root->bounds().size()).Contains(relative_point))
       return root->GetTopWindowContainingPoint(relative_point);
   }
   return nullptr;
 }
 
 std::unique_ptr<OSExchangeData::Provider> MusClient::BuildProvider() {
   return base::MakeUnique<aura::OSExchangeDataProviderMus>();
 }
 
 }  // namespace views