Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / mojo / examples / dbus_echo / dbus_echo_app.cc

diff --git a/src/mojo/examples/dbus_echo/dbus_echo_app.cc b/src/mojo/examples/dbus_echo/dbus_echo_app.cc
index 5a9b80f..ea18f8b 100644 (file)
--- a/src/mojo/examples/dbus_echo/dbus_echo_app.cc
+++ b/src/mojo/examples/dbus_echo/dbus_echo_app.cc
@@ -7,24 +7,24 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "mojo/public/cpp/application/application.h"
+#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/dbus_echo/echo.mojom.h"
 
 namespace mojo {
 namespace examples {
 
-class DBusEchoApp : public Application {
+class DBusEchoApp : public ApplicationDelegate {
  public:
   DBusEchoApp() {}
   virtual ~DBusEchoApp() {}
 
-  virtual void Initialize() MOJO_OVERRIDE {
-    ConnectTo("dbus:org.chromium.EchoService/org/chromium/MojoImpl",
-              &echo_service_);
+  virtual void Initialize(ApplicationImpl* app) MOJO_OVERRIDE {
+    app->ConnectToService(
+        "dbus:org.chromium.EchoService/org/chromium/MojoImpl", &echo_service_);
 
     echo_service_->Echo(
         String::From("who"),
@@ -44,7 +44,7 @@ class DBusEchoApp : public Application {
 }  // namespace examples
 
 // static
-Application* Application::Create() {
+ApplicationDelegate* ApplicationDelegate::Create() {
   return new examples::DBusEchoApp();
 }