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

Unified Diff: shell/application_manager/shell_impl.cc

Issue 2034383003: Removed exposed_services from mojom definitions. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 6 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') | no next file » | 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 bdd38f130b9eec58b45e196f22eac1acac130537..37d564615f51647b8d4b861a119a5ccd663abc92 100644
--- a/shell/application_manager/shell_impl.cc
+++ b/shell/application_manager/shell_impl.cc
@@ -32,10 +32,8 @@ ShellImpl::ApplicationConnectorImpl::~ApplicationConnectorImpl() {}
void ShellImpl::ApplicationConnectorImpl::ConnectToApplication(
const String& app_url,
- InterfaceRequest<ServiceProvider> services,
- InterfaceHandle<mojo::ServiceProvider> exposed_services) {
- shell_->ConnectToApplication(app_url, std::move(services),
- std::move(exposed_services));
+ InterfaceRequest<ServiceProvider> services) {
+ shell_->ConnectToApplication(app_url, std::move(services));
}
void ShellImpl::ApplicationConnectorImpl::Duplicate(
@@ -73,20 +71,17 @@ 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());
+ requested_url.spec(), std::move(services));
}
void ShellImpl::ConnectToApplication(
const String& app_url,
- InterfaceRequest<ServiceProvider> services,
- InterfaceHandle<mojo::ServiceProvider> exposed_services) {
+ InterfaceRequest<ServiceProvider> services) {
GURL app_gurl(app_url);
if (!app_gurl.is_valid()) {
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),
base::Closure());
}
« no previous file with comments | « shell/application_manager/shell_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698