Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(762)

Unified Diff: mojo/shell/connect_util.h

Issue 1743473002: Change Mojo URLs to structured names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@18collapse
Patch Set: . Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/shell/connect_params.h ('k') | mojo/shell/identity.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/connect_util.h
diff --git a/mojo/shell/connect_util.h b/mojo/shell/connect_util.h
index 5aac3c3f1ba6bc4b33b7d7b1a62f165b1a30faac..a81a13e1ca3e9c25a7bc53bdc65201ad71d08fdd 100644
--- a/mojo/shell/connect_util.h
+++ b/mojo/shell/connect_util.h
@@ -5,15 +5,11 @@
#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 +22,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 +37,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));
}
« no previous file with comments | « mojo/shell/connect_params.h ('k') | mojo/shell/identity.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698