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

Unified Diff: mojo/shell/shell_impl.cc

Issue 1228743002: Mandoline: Move ContentHandlerConnection into separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build Created 5 years, 5 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/content_handler_connection.cc ('k') | no next file » | 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 3dd524962db47bca97674b73a084cba1da4b0768..4b10471b0b3e9078b5714a831e406290313ca54e 100644
--- a/mojo/shell/shell_impl.cc
+++ b/mojo/shell/shell_impl.cc
@@ -70,9 +70,9 @@ void ShellImpl::ConnectToApplication(mojo::URLRequestPtr app_request,
LOG(ERROR) << "Error: invalid URL: " << app_request;
return;
}
- manager_->ConnectToApplication(app_request.Pass(), identity_.url,
- services.Pass(), exposed_services.Pass(),
- base::Closure());
+ manager_->ConnectToApplication(app_request.Pass(), std::string(),
+ identity_.url, services.Pass(),
+ exposed_services.Pass(), base::Closure());
}
void ShellImpl::QuitApplication() {
@@ -93,7 +93,8 @@ void ShellImpl::OnConnectionError() {
for (auto request : queued_client_requests) {
mojo::URLRequestPtr url(mojo::URLRequest::New());
url->url = mojo::String::From(request->requested_url.spec());
- manager->ConnectToApplication(url.Pass(), request->requestor_url,
+ manager->ConnectToApplication(url.Pass(), std::string(),
+ request->requestor_url,
request->services.Pass(),
request->exposed_services.Pass(),
base::Closure());
« no previous file with comments | « mojo/shell/content_handler_connection.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698