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

Unified Diff: mojo/runner/context.cc

Issue 1311353005: Adds a way to determine id of content handler that created app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tweaks Created 5 years, 4 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
Index: mojo/runner/context.cc
diff --git a/mojo/runner/context.cc b/mojo/runner/context.cc
index 7b5be566d865af49aaf78995cc01c510af10e5a8..265be1a6e4cb1c1e767ed40b5754a2a1afd22ead 100644
--- a/mojo/runner/context.cc
+++ b/mojo/runner/context.cc
@@ -195,8 +195,10 @@ void InitDevToolsServiceIfNeeded(shell::ApplicationManager* manager,
request->url = "mojo:devtools_service";
manager->ConnectToApplication(
nullptr, request.Pass(), std::string(), GURL("mojo:shell"),
+ shell::ApplicationManager::kInvalidContentHandlerID,
GetProxy(&devtools_service_provider), nullptr,
- shell::GetPermissiveCapabilityFilter(), base::Closure());
+ shell::GetPermissiveCapabilityFilter(), base::Closure(),
+ shell::EmptyConnectCallback());
devtools_service::DevToolsCoordinatorPtr devtools_coordinator;
devtools_service_provider->ConnectToService(
@@ -313,8 +315,10 @@ bool Context::Init() {
request->url = mojo::String::From("mojo:tracing");
application_manager_.ConnectToApplication(
nullptr, request.Pass(), std::string(), GURL(),
+ shell::ApplicationManager::kInvalidContentHandlerID,
GetProxy(&service_provider_ptr), tracing_service_provider_ptr.Pass(),
- shell::GetPermissiveCapabilityFilter(), base::Closure());
+ shell::GetPermissiveCapabilityFilter(), base::Closure(),
+ shell::EmptyConnectCallback());
// Record the shell startup metrics used for performance testing.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -379,9 +383,11 @@ void Context::Run(const GURL& url) {
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From(url.spec());
application_manager_.ConnectToApplication(
- nullptr, request.Pass(), std::string(), GURL(), GetProxy(&services),
+ nullptr, request.Pass(), std::string(), GURL(),
+ shell::ApplicationManager::kInvalidContentHandlerID, GetProxy(&services),
exposed_services.Pass(), shell::GetPermissiveCapabilityFilter(),
- base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url));
+ base::Bind(&Context::OnApplicationEnd, base::Unretained(this), url),
+ shell::EmptyConnectCallback());
}
void Context::RunCommandLineApplication(const base::Closure& callback) {

Powered by Google App Engine
This is Rietveld 408576698