summaryrefslogtreecommitdiffstats
path: root/mojo/shell/view_manager_loader.cc
diff options
context:
space:
mode:
authordavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 15:51:00 +0000
committerdavemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-27 15:51:00 +0000
commit922f25039d939159501fad266518290b2c05fe2a (patch)
tree82f23eaa36a8d86f86d86b7f8aa85c487629057d /mojo/shell/view_manager_loader.cc
parentbcbdd98cc4d033b29fa633cbc1c81599ba6d9977 (diff)
downloadchromium_src-922f25039d939159501fad266518290b2c05fe2a.zip
chromium_src-922f25039d939159501fad266518290b2c05fe2a.tar.gz
chromium_src-922f25039d939159501fad266518290b2c05fe2a.tar.bz2
Change Shell / ShellClient to ServiceProvider
BUG= R=darin@chromium.org Review URL: https://codereview.chromium.org/298653010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/shell/view_manager_loader.cc')
-rw-r--r--mojo/shell/view_manager_loader.cc13
1 files changed, 7 insertions, 6 deletions
diff --git a/mojo/shell/view_manager_loader.cc b/mojo/shell/view_manager_loader.cc
index c590dd7..3b4adcf 100644
--- a/mojo/shell/view_manager_loader.cc
+++ b/mojo/shell/view_manager_loader.cc
@@ -4,7 +4,7 @@
#include "mojo/shell/view_manager_loader.h"
-#include "mojo/public/cpp/shell/application.h"
+#include "mojo/public/cpp/application/application.h"
#include "mojo/services/view_manager/root_node_manager.h"
#include "mojo/services/view_manager/view_manager_connection.h"
@@ -17,13 +17,14 @@ ViewManagerLoader::ViewManagerLoader() {
ViewManagerLoader::~ViewManagerLoader() {
}
-void ViewManagerLoader::LoadService(ServiceManager* manager,
- const GURL& url,
- ScopedMessagePipeHandle shell_handle) {
- scoped_ptr<Application> app(new Application(shell_handle.Pass()));
+void ViewManagerLoader::LoadService(
+ ServiceManager* manager,
+ const GURL& url,
+ ScopedMessagePipeHandle service_provider_handle) {
+ scoped_ptr<Application> app(new Application(service_provider_handle.Pass()));
if (!root_node_manager_.get()) {
root_node_manager_.reset(
- new view_manager::service::RootNodeManager(app->shell()));
+ new view_manager::service::RootNodeManager(app->service_provider()));
}
app->AddService<view_manager::service::ViewManagerConnection>(
root_node_manager_.get());