Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/services/view_manager/root_node_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 MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 #define MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "mojo/services/view_manager/ids.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/node_delegate.h"
 #include "mojo/services/view_manager/root_view_manager.h"
 #include "mojo/services/view_manager/view_manager_export.h"
 
 namespace mojo {
 
-class ServiceProvider;
+class Shell;
 
 namespace view_manager {
 namespace service {
 
 class View;
 class ViewManagerConnection;
 
 // RootNodeManager is responsible for managing the set of ViewManagerConnections
 // as well as providing the root of the node hierarchy.
 class MOJO_VIEW_MANAGER_EXPORT RootNodeManager : public NodeDelegate {
@@ skipping 15 matching lines @@
                  bool is_delete_node);
     ~ScopedChange();
 
    private:
     RootNodeManager* root_;
     const ChangeType change_type_;
 
     DISALLOW_COPY_AND_ASSIGN(ScopedChange);
   };
 
-  explicit RootNodeManager(ServiceProvider* service_provider);
+  explicit RootNodeManager(Shell* shell);
   virtual ~RootNodeManager();
 
   // Returns the id for the next ViewManagerConnection.
   TransportConnectionId GetAndAdvanceNextConnectionId();
 
   TransportChangeId next_server_change_id() const {
     return next_server_change_id_;
   }
 
   void AddConnection(ViewManagerConnection* connection);
@@ skipping 83 matching lines @@
   Node root_;
 
   DISALLOW_COPY_AND_ASSIGN(RootNodeManager);
 };
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo
 
 #endif  // MOJO_SERVICES_VIEW_MANAGER_ROOT_NODE_MANAGER_H_