From 66bf7e2b99672c530495517abb88f5256af9d338 Mon Sep 17 00:00:00 2001 From: "davemoore@chromium.org" Date: Tue, 27 May 2014 16:50:29 +0000 Subject: Shell / ShellClient -> ServiceProvider Try #2 of https://codereview.chromium.org/298653010/ Fixed newly introduced GN dependency. TBR=darin@chromium.org BUG= Review URL: https://codereview.chromium.org/298003008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272989 0039d316-1c4b-4281-b951-d872f2087c98 --- mojo/examples/dbus_echo/dbus_echo_app.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mojo/examples/dbus_echo') 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; } -- cgit v1.1