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

Unified Diff: mojo/shell/shell_impl.cc

Issue 1121783003: Move navigations with POST or referrer to the shell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 7 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/shell_impl.h ('k') | third_party/mojo/mojom_bindings_generator_explicit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/shell_impl.cc
diff --git a/mojo/shell/shell_impl.cc b/mojo/shell/shell_impl.cc
index 42143247b1ada794b9d78706f587f180c064d866..3b38af478850fb77f5596a31b2d39b0326604afa 100644
--- a/mojo/shell/shell_impl.cc
+++ b/mojo/shell/shell_impl.cc
@@ -42,16 +42,17 @@ void ShellImpl::ConnectToClient(const GURL& requested_url,
}
// Shell implementation:
-void ShellImpl::ConnectToApplication(const String& app_url,
+void ShellImpl::ConnectToApplication(mojo::URLRequestPtr app_request,
InterfaceRequest<ServiceProvider> services,
ServiceProviderPtr exposed_services) {
- GURL app_gurl(app_url);
+ GURL app_gurl(app_request->url.To<std::string>());
if (!app_gurl.is_valid()) {
- LOG(ERROR) << "Error: invalid URL: " << app_url;
+ LOG(ERROR) << "Error: invalid URL: " << app_request;
return;
}
- manager_->ConnectToApplication(app_gurl, identity_.url, services.Pass(),
- exposed_services.Pass(), base::Closure());
+ manager_->ConnectToApplication(app_request.Pass(), identity_.url,
+ services.Pass(), exposed_services.Pass(),
+ base::Closure());
}
void ShellImpl::OnConnectionError() {
« no previous file with comments | « mojo/shell/shell_impl.h ('k') | third_party/mojo/mojom_bindings_generator_explicit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698