| Index: mojo/shell/dbus_service_loader_linux.cc
|
| diff --git a/mojo/shell/dbus_service_loader_linux.cc b/mojo/shell/dbus_service_loader_linux.cc
|
| index 64854968937f41be54e4d2bb120dcff06b8101a1..1b31fda76797acffd007ea7797f1375fa52c3ace 100644
|
| --- a/mojo/shell/dbus_service_loader_linux.cc
|
| +++ b/mojo/shell/dbus_service_loader_linux.cc
|
| @@ -39,7 +39,7 @@ class DBusServiceLoader::LoadContext : public mojo::ExternalServiceHost {
|
| LoadContext(DBusServiceLoader* loader,
|
| const scoped_refptr<dbus::Bus>& bus,
|
| const GURL& url,
|
| - ScopedShellHandle shell_handle)
|
| + ScopedMessagePipeHandle shell_handle)
|
| : loader_(loader),
|
| bus_(bus),
|
| service_dbus_proxy_(NULL),
|
| @@ -136,7 +136,7 @@ class DBusServiceLoader::LoadContext : public mojo::ExternalServiceHost {
|
| scoped_refptr<dbus::Bus> bus_;
|
| dbus::ObjectProxy* service_dbus_proxy_; // Owned by bus_;
|
| const GURL url_;
|
| - ScopedShellHandle shell_handle_;
|
| + ScopedMessagePipeHandle shell_handle_;
|
| KeepAlive keep_alive_;
|
| scoped_ptr<common::ChannelInit> channel_init_;
|
| mojo::RemotePtr<mojo::ExternalService> external_service_;
|
| @@ -157,7 +157,7 @@ DBusServiceLoader::~DBusServiceLoader() {
|
|
|
| void DBusServiceLoader::LoadService(ServiceManager* manager,
|
| const GURL& url,
|
| - ScopedShellHandle service_handle) {
|
| + ScopedMessagePipeHandle service_handle) {
|
| DCHECK(url.SchemeIs("dbus"));
|
| DCHECK(url_to_load_context_.find(url) == url_to_load_context_.end());
|
| url_to_load_context_[url] =
|
|
|