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

Unified Diff: ash/common/mojo_interface_factory.cc

Issue 2563643003: mash: Change the MediaDelegate to a Media{Controller,Client}. (Closed)
Patch Set: Comment fixes Created 4 years 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 | « ash/common/media_delegate.h ('k') | ash/common/shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/mojo_interface_factory.cc
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
index 3cdd6f1e764f48eed2846f6b20e4f75e378c132f..8a800134b220bde462cba05b87f077420c4d5a77 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -8,6 +8,7 @@
#include "ash/common/accelerators/accelerator_controller.h"
#include "ash/common/cast_config_controller.h"
+#include "ash/common/media_controller.h"
#include "ash/common/new_window_controller.h"
#include "ash/common/session/session_controller.h"
#include "ash/common/shelf/shelf_controller.h"
@@ -43,6 +44,11 @@ void BindLocaleNotificationControllerOnMainThread(
std::move(request));
}
+void BindMediaControllerRequestOnMainThread(
+ mojom::MediaControllerRequest request) {
+ WmShell::Get()->media_controller()->BindRequest(std::move(request));
+}
+
void BindNewWindowControllerRequestOnMainThread(
mojom::NewWindowControllerRequest request) {
WmShell::Get()->new_window_controller()->BindRequest(std::move(request));
@@ -96,6 +102,8 @@ void RegisterInterfaces(
registry->AddInterface(
base::Bind(&BindLocaleNotificationControllerOnMainThread),
main_thread_task_runner);
+ registry->AddInterface(base::Bind(&BindMediaControllerRequestOnMainThread),
+ main_thread_task_runner);
registry->AddInterface(
base::Bind(&BindNewWindowControllerRequestOnMainThread),
main_thread_task_runner);
« no previous file with comments | « ash/common/media_delegate.h ('k') | ash/common/shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698