Shell / ShellClient -> ServiceProvider

mojo/services/view_manager/root_node_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 "mojo/services/view_manager/root_node_manager.h"
 
 #include "base/logging.h"
 #include "mojo/services/view_manager/view_manager_connection.h"
 #include "ui/aura/env.h"
 
@@ skipping 16 matching lines @@
 }
 
 RootNodeManager::Context::Context() {
   // Pass in false as native viewport creates the PlatformEventSource.
   aura::Env::CreateInstance(false);
 }
 
 RootNodeManager::Context::~Context() {
 }
 
-RootNodeManager::RootNodeManager(Shell* shell)
+RootNodeManager::RootNodeManager(ServiceProvider* service_provider)
     : next_connection_id_(1),
       next_server_change_id_(1),
       change_source_(kRootConnection),
       is_processing_delete_node_(false),
-      root_view_manager_(shell, this),
+      root_view_manager_(service_provider, this),
       root_(this, RootNodeId()) {
 }
 
 RootNodeManager::~RootNodeManager() {
   // All the connections should have been destroyed.
   DCHECK(connection_map_.empty());
 }
 
 TransportConnectionId RootNodeManager::GetAndAdvanceNextConnectionId() {
   const TransportConnectionId id = next_connection_id_++;
@@ skipping 100 matching lines @@
 
 void RootNodeManager::OnNodeViewReplaced(const Node* node,
                                          const View* new_view,
                                          const View* old_view) {
   ProcessNodeViewReplaced(node, new_view, old_view);
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo