Shell / ShellClient -> ServiceProvider

mojo/services/public/cpp/view_manager/lib/view_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/public/cpp/view_manager/view_manager.h"
 
 #include "mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_tree_node_private.h"
 #include "mojo/services/public/cpp/view_manager/view.h"
 
 namespace mojo {
 namespace view_manager {
 
-ViewManager::ViewManager(Shell* shell)
-    : shell_(shell) {}
+ViewManager::ViewManager(ServiceProvider* service_provider)
+    : service_provider_(service_provider) {}
 
 ViewManager::~ViewManager() {
   while (!nodes_.empty()) {
     IdToNodeMap::iterator it = nodes_.begin();
     if (synchronizer_->OwnsNode(it->second->id()))
       it->second->Destroy();
     else
       nodes_.erase(it);
   }
   while (!views_.empty()) {
@@ skipping 14 matching lines @@
   return it != nodes_.end() ? it->second : NULL;
 }
 
 View* ViewManager::GetViewById(TransportViewId id) {
   IdToViewMap::const_iterator it = views_.find(id);
   return it != views_.end() ? it->second : NULL;
 }
 
 }  // namespace view_manager
 }  // namespace mojo