summaryrefslogtreecommitdiffstats
path: root/mojo/public/cpp/shell/application.h
diff options
context:
space:
mode:
Diffstat (limited to 'mojo/public/cpp/shell/application.h')
-rw-r--r--mojo/public/cpp/shell/application.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/mojo/public/cpp/shell/application.h b/mojo/public/cpp/shell/application.h
index ffca7fe..933077b 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,