| Index: mojo/examples/dbus_echo/dbus_echo_app.cc
|
| diff --git a/mojo/examples/dbus_echo/dbus_echo_app.cc b/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| index 13bf8e02499d8cbe17d547c33216e04f0e835240..c9a79618406913117a41daaa4bf62c95ac817aaf 100644
|
| --- a/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| +++ b/mojo/examples/dbus_echo/dbus_echo_app.cc
|
| @@ -7,7 +7,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.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"
|
| @@ -35,17 +34,17 @@ class DBusEchoApp : public Application {
|
| ConnectTo("dbus:org.chromium.EchoService/org/chromium/MojoImpl",
|
| &echo_service_);
|
|
|
| - AllocationScope scope;
|
| - echo_service_->Echo("who", base::Bind(&DBusEchoApp::OnEcho,
|
| - base::Unretained(this)));
|
| + echo_service_->Echo(
|
| + String::From("who"),
|
| + base::Bind(&DBusEchoApp::OnEcho, base::Unretained(this)));
|
| }
|
|
|
| virtual ~DBusEchoApp() {
|
| }
|
|
|
| private:
|
| - void OnEcho(const String& echoed) {
|
| - LOG(INFO) << "echo'd " << echoed.To<std::string>();
|
| + void OnEcho(String echoed) {
|
| + LOG(INFO) << "echo'd " << echoed;
|
| }
|
|
|
| EchoServicePtr echo_service_;
|
|
|