diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 16:04:28 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-27 16:04:28 +0000 |
| commit | 76a13298a02a60080c98dd936d3b32def6b2d2bf (patch) | |
| tree | c2290494bfa8855d112ae7a00fcea6ed64166d39 /mojo/dbus | |
| parent | 922f25039d939159501fad266518290b2c05fe2a (diff) | |
| download | chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.zip chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.tar.gz chromium_src-76a13298a02a60080c98dd936d3b32def6b2d2bf.tar.bz2 | |
Revert 272983 "Change Shell / ShellClient to ServiceProvider"
> Change Shell / ShellClient to ServiceProvider
>
> BUG=
> R=darin@chromium.org
>
> Review URL: https://codereview.chromium.org/298653010
TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/304593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272984 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/dbus')
| -rw-r--r-- | mojo/dbus/dbus_external_service.cc | 4 | ||||
| -rw-r--r-- | mojo/dbus/dbus_external_service.h | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/mojo/dbus/dbus_external_service.cc b/mojo/dbus/dbus_external_service.cc index 3b1fddf..92cd6f3 100644 --- a/mojo/dbus/dbus_external_service.cc +++ b/mojo/dbus/dbus_external_service.cc @@ -15,9 +15,9 @@ #include "dbus/message.h" #include "dbus/object_path.h" #include "mojo/common/channel_init.h" -#include "mojo/public/cpp/application/application.h" #include "mojo/public/cpp/bindings/error_handler.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/cpp/shell/application.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/shell/external_service.mojom.h" namespace mojo { diff --git a/mojo/dbus/dbus_external_service.h b/mojo/dbus/dbus_external_service.h index 54af5e9..ea72222 100644 --- a/mojo/dbus/dbus_external_service.h +++ b/mojo/dbus/dbus_external_service.h @@ -8,8 +8,8 @@ #include "dbus/message.h" #include "dbus/object_path.h" #include "mojo/common/channel_init.h" -#include "mojo/public/cpp/application/application.h" -#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" +#include "mojo/public/cpp/shell/application.h" +#include "mojo/public/interfaces/shell/shell.mojom.h" #include "mojo/shell/external_service.mojom.h" namespace mojo { @@ -72,9 +72,8 @@ class DBusExternalService : public DBusExternalServiceBase { virtual void OnConnectionError() OVERRIDE { service_->Disconnect(); } - virtual void Activate(ScopedMessagePipeHandle service_provider_handle) - OVERRIDE { - app_.reset(new Application(service_provider_handle.Pass())); + virtual void Activate(ScopedMessagePipeHandle shell_handle) OVERRIDE { + app_.reset(new Application(shell_handle.Pass())); app_->AddService<ServiceImpl>(); } private: |