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

Unified Diff: content/browser/frame_host/frame_mojo_shell.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 | « content/browser/frame_host/frame_mojo_shell.h ('k') | content/browser/mojo/mojo_app_connection_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/frame_mojo_shell.cc
diff --git a/content/browser/frame_host/frame_mojo_shell.cc b/content/browser/frame_host/frame_mojo_shell.cc
index 70af1cc9c065bf708fd2f7e8e4cd84149b222e64..752cb78f038aa2aeb2c2addaa52eba2fcb465d1e 100644
--- a/content/browser/frame_host/frame_mojo_shell.cc
+++ b/content/browser/frame_host/frame_mojo_shell.cc
@@ -48,7 +48,7 @@ void FrameMojoShell::BindRequest(mojo::shell::mojom::ConnectorRequest request) {
// drop it and replace it with services we provide in the browser. In the
// future we may need to support both.
void FrameMojoShell::Connect(
- const mojo::String& application_url,
+ const mojo::String& application_name,
uint32_t user_id,
mojo::shell::mojom::InterfaceProviderRequest services,
mojo::shell::mojom::InterfaceProviderPtr /* exposed_services */,
@@ -60,8 +60,8 @@ void FrameMojoShell::Connect(
GetProxy(&frame_services));
MojoShellContext::ConnectToApplication(
- application_url.To<GURL>(),
- frame_host_->GetSiteInstance()->GetSiteURL(), std::move(services),
+ application_name,
+ frame_host_->GetSiteInstance()->GetSiteURL().spec(), std::move(services),
std::move(frame_services), callback);
}
« no previous file with comments | « content/browser/frame_host/frame_mojo_shell.h ('k') | content/browser/mojo/mojo_app_connection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698