summaryrefslogtreecommitdiffstats
path: root/mojo/examples/dbus_echo
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/examples/dbus_echo
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/examples/dbus_echo')
-rw-r--r--mojo/examples/dbus_echo/dbus_echo_app.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc
index 13bf8e0..f9b9433 100644
--- a/mojo/examples/dbus_echo/dbus_echo_app.cc
+++ b/mojo/examples/dbus_echo/dbus_echo_app.cc
@@ -7,13 +7,13 @@
#include "base/bind.h"
#include "base/logging.h"
+#include "mojo/public/cpp/application/application.h"
#include "mojo/public/cpp/bindings/allocation_scope.h"
#include "mojo/public/cpp/environment/environment.h"
-#include "mojo/public/cpp/shell/application.h"
#include "mojo/public/cpp/system/core.h"
#include "mojo/public/cpp/system/macros.h"
#include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/interfaces/shell/shell.mojom.h"
+#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
#include "mojo/services/dbus_echo/echo.mojom.h"
#if defined(WIN32)
@@ -31,7 +31,8 @@ namespace examples {
class DBusEchoApp : public Application {
public:
- explicit DBusEchoApp(MojoHandle shell_handle) : Application(shell_handle) {
+ explicit DBusEchoApp(MojoHandle service_provider_handle)
+ : Application(service_provider_handle) {
ConnectTo("dbus:org.chromium.EchoService/org/chromium/MojoImpl",
&echo_service_);
@@ -55,11 +56,11 @@ class DBusEchoApp : public Application {
} // namespace mojo
extern "C" DBUS_ECHO_APP_EXPORT MojoResult CDECL MojoMain(
- MojoHandle shell_handle) {
+ MojoHandle service_provider_handle) {
mojo::Environment env;
mojo::RunLoop loop;
- mojo::examples::DBusEchoApp app(shell_handle);
+ mojo::examples::DBusEchoApp app(service_provider_handle);
loop.Run();
return MOJO_RESULT_OK;
}