Revert of Start of display management for mus

components/mus/ws/connection_manager.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 #define COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
-#include "components/mus/public/interfaces/display.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/surfaces/surfaces_state.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/operation.h"
 #include "components/mus/ws/server_window_delegate.h"
 #include "components/mus/ws/server_window_observer.h"
 #include "components/mus/ws/window_tree_host_impl.h"
-#include "mojo/common/weak_binding_set.h"
-#include "mojo/common/weak_interface_ptr_set.h"
 #include "mojo/converters/surfaces/custom_surface_converter.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace mus {
 namespace ws {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
 class ServerWindow;
 class WindowTreeHostConnection;
 class WindowTreeImpl;
 
 // ConnectionManager manages the set of connections to the window server (all
 // the WindowTreeImpls) as well as providing the root of the hierarchy.
-//
-// TODO(sky): this class is doing too much. Refactor to make responsibilities
-// clearer.
 class ConnectionManager : public ServerWindowDelegate,
-                          public ServerWindowObserver,
-                          public mojom::DisplayManager {
+                          public ServerWindowObserver {
  public:
   ConnectionManager(ConnectionManagerDelegate* delegate,
                     const scoped_refptr<mus::SurfacesState>& surfaces_state);
   ~ConnectionManager() override;
 
   // Adds a WindowTreeHost.
   void AddHost(WindowTreeHostConnection* connection);
 
   // Creates a new ServerWindow. The return value is owned by the caller, but
   // must be destroyed before ConnectionManager.
@@ skipping 66 matching lines @@
   WindowTreeHostImpl* GetWindowTreeHostByWindow(const ServerWindow* window);
   const WindowTreeHostImpl* GetWindowTreeHostByWindow(
       const ServerWindow* window) const;
 
   WindowTreeHostImpl* GetActiveWindowTreeHost();
 
   bool has_tree_host_connections() const {
     return !host_connection_map_.empty();
   }
 
-  void AddDisplayManagerBinding(
-      mojo::InterfaceRequest<mojom::DisplayManager> request);
-
   // Returns a change id for the window manager that is associated with
   // |source| and |client_change_id|. When the window manager replies
   // WindowManagerChangeCompleted() is called to obtain the original source
   // and client supplied change_id that initiated the called.
   uint32_t GenerateWindowManagerChangeId(WindowTreeImpl* source,
                                          uint32_t client_change_id);
 
   // Called when a response from the window manager is obtained. Calls to
   // the client that initiated the change with the change id originally
   // supplied by the client.
@@ skipping 109 matching lines @@
       const std::vector<uint8_t>* new_data) override;
   void OnWindowPredefinedCursorChanged(ServerWindow* window,
                                        int32_t cursor_id) override;
   void OnWindowTextInputStateChanged(ServerWindow* window,
                                      const ui::TextInputState& state) override;
   void OnTransientWindowAdded(ServerWindow* window,
                               ServerWindow* transient_child) override;
   void OnTransientWindowRemoved(ServerWindow* window,
                                 ServerWindow* transient_child) override;
 
-  // Overriden from mojom::DisplayManager:
-  void AddObserver(mojom::DisplayManagerObserverPtr observer) override;
-
   ConnectionManagerDelegate* delegate_;
 
   // State for rendering into a Surface.
   scoped_refptr<mus::SurfacesState> surfaces_state_;
 
   // ID to use for next WindowTreeImpl.
   ConnectionSpecificId next_connection_id_;
 
   // ID to use for next WindowTreeHostImpl.
   uint16_t next_host_id_;
@@ skipping 10 matching lines @@
 
   bool in_destructor_;
 
   // Maps from window manager change id to the client that initiated the
   // request.
   InFlightWindowManagerChangeMap in_flight_wm_change_map_;
 
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
-  mojo::WeakBindingSet<mojom::DisplayManager> display_manager_bindings_;
-  mojo::WeakInterfacePtrSet<mojom::DisplayManagerObserver>
-      display_manager_observers_;
-
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace ws
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_CONNECTION_MANAGER_H_