Revert 272983 "Change Shell / ShellClient to ServiceProvider"

trunk/src/mojo/services/public/cpp/view_manager/view_manager.h

Index: trunk/src/mojo/services/public/cpp/view_manager/view_manager.h
===================================================================
--- trunk/src/mojo/services/public/cpp/view_manager/view_manager.h	(revision 272983)
+++ trunk/src/mojo/services/public/cpp/view_manager/view_manager.h	(working copy)
@@ -13,7 +13,7 @@
 #include "mojo/services/public/cpp/view_manager/view_tree_node.h"
 
 namespace mojo {
-class ServiceProvider;
+class Shell;
 namespace view_manager {
 
 class View;
@@ -27,7 +27,7 @@
 // TODO: displays
 class ViewManager {
  public:
-  explicit ViewManager(ServiceProvider* service_provider);
+  explicit ViewManager(Shell* shell);
   ~ViewManager();
 
   // Connects to the View Manager service. This method must be called before
@@ -51,7 +51,7 @@
   typedef std::map<TransportNodeId, ViewTreeNode*> IdToNodeMap;
   typedef std::map<TransportViewId, View*> IdToViewMap;
 
-  ServiceProvider* service_provider_;
+  Shell* shell_;
   scoped_ptr<ViewManagerSynchronizer> synchronizer_;
   ViewTreeNode* tree_;