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

Unified Diff: ui/views/mus/surface_binding.cc

Issue 1474563002: Make CapabilityFilter non-nullable. (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/application/public/interfaces/shell.mojom ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/surface_binding.cc
diff --git a/ui/views/mus/surface_binding.cc b/ui/views/mus/surface_binding.cc
index 2c6220b83e0316b793edc2623d38351a21d26e3b..74b97306940e3f01a2f6eb46c6dde6d987975341 100644
--- a/ui/views/mus/surface_binding.cc
+++ b/ui/views/mus/surface_binding.cc
@@ -19,6 +19,7 @@
#include "components/mus/public/cpp/window.h"
#include "components/mus/public/cpp/window_tree_connection.h"
#include "components/mus/public/interfaces/gpu.mojom.h"
+#include "mojo/application/public/cpp/application_impl.h"
#include "mojo/application/public/cpp/connect.h"
#include "mojo/application/public/interfaces/shell.mojom.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
@@ -128,7 +129,8 @@ void SurfaceBinding::PerConnectionState::Init() {
mojo::URLRequestPtr request(mojo::URLRequest::New());
request->url = mojo::String::From("mojo:mus");
shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
- nullptr, nullptr,
+ nullptr,
+ mojo::CreatePermissiveCapabilityFilter(),
base::Bind(&OnGotContentHandlerID));
ConnectToService(service_provider.get(), &gpu_);
}
« no previous file with comments | « mojo/application/public/interfaces/shell.mojom ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698