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

Unified Diff: content/browser/mojo/renderer_capability_filter.cc

Issue 1738663002: Hook embedded shell up to MojoShellConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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: content/browser/mojo/renderer_capability_filter.cc
diff --git a/content/browser/mojo/renderer_capability_filter.cc b/content/browser/mojo/renderer_capability_filter.cc
index d2f362e5d3a79f503114131a9b5258a2aeef2154..c08f5e984ea768377d8da3d71b8c19011e6d5286 100644
--- a/content/browser/mojo/renderer_capability_filter.cc
+++ b/content/browser/mojo/renderer_capability_filter.cc
@@ -4,9 +4,12 @@
#include <utility>
-#include "components/mus/public/interfaces/gpu.mojom.h"
#include "content/browser/mojo/mojo_shell_client_host.h"
+#if defined(MOJO_SHELL_CLIENT)
+#include "components/mus/public/interfaces/gpu.mojom.h"
+#endif
+
namespace content {
mojo::shell::mojom::CapabilityFilterPtr CreateCapabilityFilterForRenderer() {
@@ -14,9 +17,12 @@ mojo::shell::mojom::CapabilityFilterPtr CreateCapabilityFilterForRenderer() {
// think about when changing it.
mojo::shell::mojom::CapabilityFilterPtr filter(
mojo::shell::mojom::CapabilityFilter::New());
+ filter->filter.SetToEmpty();
+#if defined(MOJO_SHELL_CLIENT)
mojo::Array<mojo::String> window_manager_interfaces;
window_manager_interfaces.push_back(mus::mojom::Gpu::Name_);
filter->filter.insert("mojo:mus", std::move(window_manager_interfaces));
+#endif
return filter;
}
« no previous file with comments | « content/browser/mojo/mojo_shell_context.cc ('k') | content/browser/renderer_host/render_process_host_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698