Nukes the windowmanager interface

components/view_manager/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_VIEW_MANAGER_CONNECTION_MANAGER_H_
 #define COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_
 
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "components/native_viewport/public/interfaces/native_viewport.mojom.h"
 #include "components/view_manager/animation_runner.h"
 #include "components/view_manager/event_dispatcher.h"
 #include "components/view_manager/focus_controller_delegate.h"
 #include "components/view_manager/ids.h"
 #include "components/view_manager/public/interfaces/view_manager.mojom.h"
+#include "components/view_manager/public/interfaces/view_manager_root.mojom.h"
 #include "components/view_manager/server_view_delegate.h"
 #include "components/view_manager/server_view_observer.h"
-#include "components/window_manager/public/interfaces/window_manager_internal.mojom.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 
 namespace view_manager {
 
 class ClientConnection;
 class ConnectionManagerDelegate;
 class DisplayManager;
 class FocusController;
 class ServerView;
 class ViewManagerServiceImpl;
 
 // ConnectionManager manages the set of connections to the ViewManager (all the
 // ViewManagerServiceImpls) as well as providing the root of the hierarchy.
 class ConnectionManager : public ServerViewDelegate,
                           public ServerViewObserver,
-                          public mojo::WindowManagerInternalClient,
+                          public mojo::ViewManagerRoot,
                           public FocusControllerDelegate {
  public:
   // Create when a ViewManagerServiceImpl is about to make a change. Ensures
   // clients are notified correctly.
   class ScopedChange {
    public:
     ScopedChange(ViewManagerServiceImpl* connection,
                  ConnectionManager* connection_manager,
                  bool is_delete_view);
     ~ScopedChange();
@@ skipping 16 matching lines @@
     const mojo::ConnectionSpecificId connection_id_;
     const bool is_delete_view_;
 
     // See description of MarkConnectionAsMessaged/DidMessageConnection.
     std::set<mojo::ConnectionSpecificId> message_ids_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
   ConnectionManager(ConnectionManagerDelegate* delegate,
-                    scoped_ptr<DisplayManager> display_manager,
-                    mojo::WindowManagerInternal* wm_internal);
+                    scoped_ptr<DisplayManager> display_manager);
   ~ConnectionManager() override;
 
   // Creates a new ServerView. The return value is owned by the caller, but must
   // be destroyed before ConnectionManager.
   ServerView* CreateServerView(const ViewId& id);
 
   // Returns the id for the next ViewManagerServiceImpl.
   mojo::ConnectionSpecificId GetAndAdvanceNextConnectionId();
 
   // Invoked when a ViewManagerServiceImpl's connection encounters an error.
@@ skipping 36 matching lines @@
   // Returns true if OnConnectionMessagedClient() was invoked for id.
   bool DidConnectionMessageClient(mojo::ConnectionSpecificId id) const;
 
   // Returns the ViewManagerServiceImpl that has |id| as a root.
   ViewManagerServiceImpl* GetConnectionWithRoot(const ViewId& id) {
     return const_cast<ViewManagerServiceImpl*>(
         const_cast<const ConnectionManager*>(this)->GetConnectionWithRoot(id));
   }
   const ViewManagerServiceImpl* GetConnectionWithRoot(const ViewId& id) const;
 
-  mojo::WindowManagerInternal* wm_internal() { return wm_internal_; }
+  mojo::ViewManagerRootClient* view_manager_root_client() {
+    return view_manager_root_client_.get();
+  }
 
   void SetWindowManagerClientConnection(
       scoped_ptr<ClientConnection> connection);
   bool has_window_manager_client_connection() const {
     return window_manager_client_connection_ != nullptr;
   }
 
   mojo::ViewManagerClient* GetWindowManagerViewManagerClient();
 
-  // WindowManagerInternalClient implementation helper; see mojom for details.
+  // ViewManagerRoot implementation helper; see mojom for details.
   bool CloneAndAnimate(const ViewId& view_id);
 
   // Processes an event, potentially changing focus.
   void ProcessEvent(mojo::EventPtr event);
 
   // Dispatches |event| directly to the appropriate connection for |view|.
   void DispatchInputEventToView(const ServerView* view, mojo::EventPtr event);
 
   // These functions trivially delegate to all ViewManagerServiceImpls, which in
   // term notify their clients.
@@ skipping 61 matching lines @@
                            const gfx::Rect& new_bounds) override;
   void OnViewReordered(ServerView* view,
                        ServerView* relative,
                        mojo::OrderDirection direction) override;
   void OnWillChangeViewVisibility(ServerView* view) override;
   void OnViewSharedPropertyChanged(
       ServerView* view,
       const std::string& name,
       const std::vector<uint8_t>* new_data) override;
 
-  // WindowManagerInternalClient:
-  void DispatchInputEventToViewDEPRECATED(mojo::Id transport_view_id,
-                                          mojo::EventPtr event) override;
+  // ViewManagerRoot:
+  void SetViewManagerRootClient(mojo::ViewManagerRootClientPtr client) override;
   void SetViewportSize(mojo::SizePtr size) override;
   void CloneAndAnimate(mojo::Id transport_view_id) override;
   void AddAccelerator(mojo::KeyboardCode keyboard_code,
                       mojo::EventFlags flags) override;
   void RemoveAccelerator(mojo::KeyboardCode keyboard_code,
                          mojo::EventFlags flags) override;
 
   // FocusControllerDelegate:
   void OnFocusChanged(ServerView* old_focused_view,
                       ServerView* new_focused_view) override;
 
   ConnectionManagerDelegate* delegate_;
 
   // The ClientConnection containing the ViewManagerService implementation
   // provided to the initial connection (the WindowManager).
   // NOTE: |window_manager_client_connection_| is also in |connection_map_|.
   ClientConnection* window_manager_client_connection_;
 
   // ID to use for next ViewManagerServiceImpl.
   mojo::ConnectionSpecificId next_connection_id_;
 
   // Set of ViewManagerServiceImpls.
   ConnectionMap connection_map_;
 
   scoped_ptr<DisplayManager> display_manager_;
 
   scoped_ptr<ServerView> root_;
 
-  mojo::WindowManagerInternal* wm_internal_;
-
   // If non-null we're processing a change. The ScopedChange is not owned by us
   // (it's created on the stack by ViewManagerServiceImpl).
   ScopedChange* current_change_;
 
   bool in_destructor_;
 
   // TODO(sky): nuke! Just a proof of concept until get real animation api.
   base::RepeatingTimer<ConnectionManager> animation_timer_;
 
   AnimationRunner animation_runner_;
 
   EventDispatcher event_dispatcher_;
 
   mojo::Binding<mojo::NativeViewportEventDispatcher> event_dispatcher_binding_;
 
   scoped_ptr<FocusController> focus_controller_;
 
+  mojo::ViewManagerRootClientPtr view_manager_root_client_;
+
   DISALLOW_COPY_AND_ASSIGN(ConnectionManager);
 };
 
 }  // namespace view_manager
 
 #endif  // COMPONENTS_VIEW_MANAGER_CONNECTION_MANAGER_H_