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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 1965563002: Neuter the wrong-way ServiceProvider (a.k.a. exposed_services). (Closed) Base URL: https://github.com/domokit/mojo.git@work795_js_wrong_way
Patch Set: rebased Created 4 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 | « shell/application_manager/shell_impl.h ('k') | shell/context.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/application_manager/shell_impl.cc
diff --git a/shell/application_manager/shell_impl.cc b/shell/application_manager/shell_impl.cc
index b1c97c1d80e783e11d5a66117cad18c0a6be8bb4..bdd38f130b9eec58b45e196f22eac1acac130537 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -69,14 +69,12 @@ void ShellImpl::InitializeApplication(Array<String> args) {
identity_.url.spec());
}
-void ShellImpl::ConnectToClient(
- const GURL& requested_url,
- const GURL& requestor_url,
- InterfaceRequest<ServiceProvider> services,
- InterfaceHandle<ServiceProvider> exposed_services) {
- application_->AcceptConnection(
- String::From(requestor_url), std::move(services),
- std::move(exposed_services), requested_url.spec());
+void ShellImpl::ConnectToClient(const GURL& requested_url,
+ const GURL& requestor_url,
+ InterfaceRequest<ServiceProvider> services) {
+ application_->AcceptConnection(String::From(requestor_url),
+ std::move(services), nullptr,
+ requested_url.spec());
}
void ShellImpl::ConnectToApplication(
@@ -88,8 +86,9 @@ void ShellImpl::ConnectToApplication(
LOG(ERROR) << "Error: invalid URL: " << app_url;
return;
}
+ LOG_IF(ERROR, exposed_services) << "exposed_services no longer supported!";
manager_->ConnectToApplication(app_gurl, identity_.url, std::move(services),
- std::move(exposed_services), base::Closure());
+ base::Closure());
}
void ShellImpl::CreateApplicationConnector(
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | shell/context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698