Revert: Change CaptureSynchronizer and PointerWatcherEventRouter to support multiple CaptureClients

ui/views/mus/mus_client.h

 // 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.
 
 #ifndef UI_VIEWS_MUS_MUS_CLIENT_H_
 #define UI_VIEWS_MUS_MUS_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
-#include "ui/aura/client/capture_client.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
 #include "ui/views/mus/mus_export.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/widget/widget.h"
 
 namespace aura {
 class PropertyConverter;
 class Window;
 class WindowTreeClient;
@@ skipping 69 matching lines @@
   PointerWatcherEventRouter* pointer_watcher_event_router() {
     return pointer_watcher_event_router_.get();
   }
 
   // Creates DesktopNativeWidgetAura with DesktopWindowTreeHostMus. This is
   // set as the factory function used for creating NativeWidgets when a
   //  NativeWidget has not been explicitly set.
   NativeWidget* CreateNativeWidget(const Widget::InitParams& init_params,
                                    internal::NativeWidgetDelegate* delegate);
 
-  // Called when the capture client has been set for a window to notify
-  // PointerWatcherEventRouter and CaptureSynchronizer.
-  void OnCaptureClientSet(aura::client::CaptureClient* capture_client);
-
-  // Called when the capture client will be unset for a window to notify
-  // PointerWatcherEventRouter and CaptureSynchronizer.
-  void OnCaptureClientUnset(aura::client::CaptureClient* capture_client);
-
   void AddObserver(MusClientObserver* observer);
   void RemoveObserver(MusClientObserver* observer);
 
   void SetMusPropertyMirror(std::unique_ptr<MusPropertyMirror> mirror);
   MusPropertyMirror* mus_property_mirror() {
     return mus_property_mirror_.get();
   }
 
  private:
   friend class AuraInit;
@@ skipping 39 matching lines @@
 
   std::unique_ptr<discardable_memory::ClientDiscardableSharedMemoryManager>
       discardable_shared_memory_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(MusClient);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_MUS_MUS_CLIENT_H_