| Index: mojo/shell/connect_util.h
|
| diff --git a/mojo/shell/connect_util.h b/mojo/shell/connect_util.h
|
| index 5aac3c3f1ba6bc4b33b7d7b1a62f165b1a30faac..d2f3ce1bae1dee7c719883127410c8460b1b4cd7 100644
|
| --- a/mojo/shell/connect_util.h
|
| +++ b/mojo/shell/connect_util.h
|
| @@ -5,14 +5,9 @@
|
| #ifndef MOJO_SHELL_CONNECT_UTIL_H_
|
| #define MOJO_SHELL_CONNECT_UTIL_H_
|
|
|
| -#include <utility>
|
| -
|
| #include "mojo/public/cpp/bindings/interface_ptr.h"
|
| #include "mojo/public/cpp/system/handle.h"
|
| #include "mojo/shell/identity.h"
|
| -#include "mojo/shell/public/interfaces/shell.mojom.h"
|
| -
|
| -class GURL;
|
|
|
| namespace mojo {
|
| namespace shell {
|
| @@ -26,7 +21,7 @@ ScopedMessagePipeHandle ConnectToInterfaceByName(
|
| const std::string& interface_name);
|
|
|
| // Must only be used by shell internals and test code as it does not forward
|
| -// capability filters. Runs |application_url| with a permissive capability
|
| +// capability filters. Runs |application_name| with a permissive capability
|
| // filter.
|
| template <typename Interface>
|
| inline void ConnectToInterface(ApplicationManager* application_manager,
|
| @@ -41,11 +36,11 @@ inline void ConnectToInterface(ApplicationManager* application_manager,
|
| template <typename Interface>
|
| inline void ConnectToInterface(ApplicationManager* application_manager,
|
| const Identity& source,
|
| - const GURL& application_url,
|
| + const std::string& application_name,
|
| InterfacePtr<Interface>* ptr) {
|
| ScopedMessagePipeHandle service_handle = ConnectToInterfaceByName(
|
| application_manager, source,
|
| - Identity(application_url, std::string(), mojom::Connector::kUserInherit),
|
| + Identity(application_name, std::string(), mojom::Connector::kUserInherit),
|
| Interface::Name_);
|
| ptr->Bind(InterfacePtrInfo<Interface>(std::move(service_handle), 0u));
|
| }
|
|
|