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

Unified Diff: mojo/shell/application_manager.cc

Issue 1465793005: Pass CapabilityFilter via CreateInstanceForHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 1 month 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/application_manager.h ('k') | mojo/shell/application_manager.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/application_manager.cc
diff --git a/mojo/shell/application_manager.cc b/mojo/shell/application_manager.cc
index 1e9e2a7da6f26a6b257e16f596c192a84cdba4da..89f248e921081ed2a3ff5e7e5edcb7d7c1e8caa8 100644
--- a/mojo/shell/application_manager.cc
+++ b/mojo/shell/application_manager.cc
@@ -117,14 +117,16 @@ ApplicationInstance* ApplicationManager::GetApplicationInstance(
}
void ApplicationManager::CreateInstanceForHandle(ScopedHandle channel,
- const GURL& url) {
+ const GURL& url,
+ CapabilityFilterPtr filter) {
// Instances created by others are considered unique, and thus have no
// identity. As such they cannot be connected to by anyone else, and so we
// never call ConnectToClient().
// TODO(beng): GetPermissiveCapabilityFilter() here obviously cannot make it
// to production. See note in application_manager.mojom.
// http://crbug.com/555392
- Identity target_id(url, std::string(), GetPermissiveCapabilityFilter());
+ CapabilityFilter local_filter = filter->filter.To<CapabilityFilter>();
+ Identity target_id(url, std::string(), local_filter);
InterfaceRequest<Application> application_request =
CreateInstance(target_id, base::Closure(), nullptr);
NativeRunner* runner =
« no previous file with comments | « mojo/shell/application_manager.h ('k') | mojo/shell/application_manager.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698