Nukes the windowmanager interface

components/view_manager/connection_manager.cc

 // 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.
 
 #include "components/view_manager/connection_manager.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager_delegate.h"
@@ skipping 93 matching lines @@
       connection_id_(connection->id()),
       is_delete_view_(is_delete_view) {
   connection_manager_->PrepareForChange(this);
 }
 
 ConnectionManager::ScopedChange::~ScopedChange() {
   connection_manager_->FinishChange();
 }
 
 ConnectionManager::ConnectionManager(ConnectionManagerDelegate* delegate,
-                                     scoped_ptr<DisplayManager> display_manager,
-                                     mojo::WindowManagerInternal* wm_internal)
+                                     scoped_ptr<DisplayManager> display_manager)
     : delegate_(delegate),
       window_manager_client_connection_(nullptr),
       next_connection_id_(1),
       display_manager_(display_manager.Pass()),
       root_(CreateServerView(RootViewId())),
-      wm_internal_(wm_internal),
       current_change_(nullptr),
       in_destructor_(false),
       animation_runner_(base::TimeTicks::Now()),
       event_dispatcher_(this),
       event_dispatcher_binding_(&event_dispatcher_),
       focus_controller_(new FocusController(this, root_.get())) {
   root_->SetBounds(gfx::Rect(800, 600));
   root_->SetVisible(true);
 
   mojo::NativeViewportEventDispatcherPtr event_dispatcher_ptr;
@@ skipping 386 matching lines @@
 void ConnectionManager::OnViewSharedPropertyChanged(
     ServerView* view,
     const std::string& name,
     const std::vector<uint8_t>* new_data) {
   for (auto& pair : connection_map_) {
     pair.second->service()->ProcessViewPropertyChanged(
         view, name, new_data, IsChangeSource(pair.first));
   }
 }
 
+void ConnectionManager::SetViewManagerRootClient(
+    mojo::ViewManagerRootClientPtr client) {
+  view_manager_root_client_ = client.Pass();
+}
+
 void ConnectionManager::SetViewportSize(mojo::SizePtr size) {
   display_manager_->SetViewportSize(size.To<gfx::Size>());
 }
 
-void ConnectionManager::DispatchInputEventToViewDEPRECATED(
-    mojo::Id transport_view_id,
-    mojo::EventPtr event) {
-  const ViewId view_id(ViewIdFromTransportId(transport_view_id));
-
-  ViewManagerServiceImpl* connection = GetConnectionWithRoot(view_id);
-  if (!connection)
-    connection = GetConnection(view_id.connection_id);
-  if (connection) {
-    connection->client()->OnViewInputEvent(
-        transport_view_id, event.Pass(), base::Bind(&base::DoNothing));
-  }
-}
-
 void ConnectionManager::CloneAndAnimate(mojo::Id transport_view_id) {
   CloneAndAnimate(ViewIdFromTransportId(transport_view_id));
 }
 
 void ConnectionManager::AddAccelerator(mojo::KeyboardCode keyboard_code,
                                        mojo::EventFlags flags) {
   event_dispatcher_.AddAccelerator(keyboard_code, flags);
 }
 
 void ConnectionManager::RemoveAccelerator(mojo::KeyboardCode keyboard_code,
@@ skipping 53 matching lines @@
     if (wm_connection != owning_connection_old &&
         wm_connection != embedded_connection_old &&
         wm_connection != owning_connection_new &&
         wm_connection != embedded_connection_new) {
       wm_connection->ProcessFocusChanged(old_focused_view, new_focused_view);
     }
   }
 }
 
 }  // namespace view_manager