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

Unified Diff: shell/context.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.cc ('k') | shell/native_runner_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index 55aadb44c5cf8b18d7c7bf63cdda24154a164a0d..7e9e5dddaef5bc5f65b299f0146104b47965b409 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -311,7 +311,7 @@ bool Context::InitWithPaths(
ServiceProviderPtr tracing_services;
application_manager_.ConnectToApplication(GURL("mojo:tracing"), GURL(""),
GetProxy(&tracing_services),
- nullptr, base::Closure());
+ base::Closure());
if (tracer_) {
tracing::TraceProviderRegistryPtr registry;
mojo::ConnectToService(tracing_services.get(), GetProxy(&registry));
@@ -358,11 +358,10 @@ void Context::OnSlaveDisconnect(mojo::embedder::SlaveInfo slave_info) {
void Context::Run(const GURL& url) {
ServiceProviderPtr services;
- ServiceProviderPtr exposed_services;
app_urls_.insert(url);
application_manager_.ConnectToApplication(
- url, GURL(), mojo::GetProxy(&services), exposed_services.Pass(),
+ url, GURL(), mojo::GetProxy(&services),
base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
}
« no previous file with comments | « shell/application_manager/shell_impl.cc ('k') | shell/native_runner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698