Index: mojo/public/cpp/shell/application.h |
diff --git a/mojo/public/cpp/shell/application.h b/mojo/public/cpp/shell/application.h |
index ffca7fe68220467b22390cd9557302cdf9827dc9..933077bfdc9e4a01751e587530afc1d4a0cbfc33 100644 |
--- a/mojo/public/cpp/shell/application.h |
+++ b/mojo/public/cpp/shell/application.h |
@@ -7,7 +7,6 @@ |
#include <vector> |
-#include "mojo/public/cpp/bindings/remote_ptr.h" |
#include "mojo/public/cpp/shell/service.h" |
#include "mojo/public/cpp/system/core.h" |
#include "mojo/public/interfaces/shell/shell.mojom.h" |
@@ -16,7 +15,7 @@ namespace mojo { |
class Application : public internal::ServiceConnectorBase::Owner { |
public: |
- explicit Application(ScopedShellHandle shell_handle); |
+ explicit Application(ScopedMessagePipeHandle shell_handle); |
explicit Application(MojoHandle shell_handle); |
virtual ~Application(); |
@@ -27,6 +26,11 @@ class Application : public internal::ServiceConnectorBase::Owner { |
virtual void RemoveServiceConnector( |
internal::ServiceConnectorBase* service_connector) MOJO_OVERRIDE; |
+ template <typename Interface> |
+ void ConnectTo(const std::string& url, InterfacePtr<Interface>* ptr) { |
+ mojo::ConnectTo(shell(), url, ptr); |
+ } |
+ |
protected: |
// ShellClient methods. |
virtual void AcceptConnection(const mojo::String& url, |