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

Unified Diff: services/ui/display/screen_manager_ozone_internal.cc

Issue 2675743002: PPAPI: Make output protection API work with mus+ash (Closed)
Patch Set: Addressed review issues Created 3 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
« no previous file with comments | « services/ui/display/screen_manager_ozone_internal.h ('k') | services/ui/manifest.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/display/screen_manager_ozone_internal.cc
diff --git a/services/ui/display/screen_manager_ozone_internal.cc b/services/ui/display/screen_manager_ozone_internal.cc
index 0e67d0530ce63eca2bee16008e6298d048ef054e..0468312067019cd84dd9df8ec91d3309eeabf268 100644
--- a/services/ui/display/screen_manager_ozone_internal.cc
+++ b/services/ui/display/screen_manager_ozone_internal.cc
@@ -11,7 +11,9 @@
#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chromeos/system/devicemode.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/ui/display/output_protection.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/display/manager/chromeos/display_change_observer.h"
#include "ui/display/manager/chromeos/touch_transform_controller.h"
@@ -135,6 +137,7 @@ void ScreenManagerOzoneInternal::SetPrimaryDisplayId(int64_t display_id) {
void ScreenManagerOzoneInternal::AddInterfaces(
service_manager::InterfaceRegistry* registry) {
registry->AddInterface<mojom::DisplayController>(this);
+ registry->AddInterface<mojom::OutputProtection>(this);
registry->AddInterface<mojom::TestDisplayController>(this);
}
@@ -391,6 +394,14 @@ void ScreenManagerOzoneInternal::Create(
void ScreenManagerOzoneInternal::Create(
const service_manager::Identity& remote_identity,
+ mojom::OutputProtectionRequest request) {
+ mojo::MakeStrongBinding(
+ base::MakeUnique<OutputProtection>(display_configurator()),
+ std::move(request));
+}
+
+void ScreenManagerOzoneInternal::Create(
+ const service_manager::Identity& remote_identity,
mojom::TestDisplayControllerRequest request) {
test_bindings_.AddBinding(this, std::move(request));
}
« no previous file with comments | « services/ui/display/screen_manager_ozone_internal.h ('k') | services/ui/manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698