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

Unified Diff: mojo/shell/public/cpp/lib/shell_connection.cc

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/public/cpp/lib/shell_client.cc ('k') | mojo/shell/public/cpp/names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/public/cpp/lib/shell_connection.cc
diff --git a/mojo/shell/public/cpp/lib/shell_connection.cc b/mojo/shell/public/cpp/lib/shell_connection.cc
index 5977cc64a9f1be90a37145f983a3a009b49c1db6..5649a1844fc836d4c76caf1acd368d04c11a0440 100644
--- a/mojo/shell/public/cpp/lib/shell_connection.cc
+++ b/mojo/shell/public/cpp/lib/shell_connection.cc
@@ -35,26 +35,26 @@ void ShellConnection::WaitForInitialize() {
// ShellConnection, shell::mojom::ShellClient implementation:
void ShellConnection::Initialize(shell::mojom::ConnectorPtr connector,
- const mojo::String& url,
+ const mojo::String& name,
uint32_t id,
uint32_t user_id) {
connector_.reset(new ConnectorImpl(
std::move(connector),
base::Bind(&ShellConnection::OnConnectionError,
weak_factory_.GetWeakPtr())));
- client_->Initialize(connector_.get(), url, id, user_id);
+ client_->Initialize(connector_.get(), name, id, user_id);
}
void ShellConnection::AcceptConnection(
- const String& requestor_url,
+ const String& requestor_name,
uint32_t requestor_id,
uint32_t requestor_user_id,
shell::mojom::InterfaceProviderRequest local_interfaces,
shell::mojom::InterfaceProviderPtr remote_interfaces,
Array<String> allowed_interfaces,
- const String& url) {
+ const String& name) {
scoped_ptr<Connection> registry(new internal::ConnectionImpl(
- url, requestor_url, requestor_id, requestor_user_id,
+ name, requestor_name, requestor_id, requestor_user_id,
std::move(remote_interfaces), std::move(local_interfaces),
allowed_interfaces.To<std::set<std::string>>()));
if (!client_->AcceptConnection(registry.get()))
« no previous file with comments | « mojo/shell/public/cpp/lib/shell_client.cc ('k') | mojo/shell/public/cpp/names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698