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

Unified Diff: ash/common/mojo_interface_factory.cc

Issue 2545723003: ash: Add SessionController/Client mojo interfaces (Closed)
Patch Set: use a default to fix null avatar image failures 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
Index: ash/common/mojo_interface_factory.cc
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
index f8bab26711a577dd45cc822ecdf41ca7919cfeaf..2e9becd3c65eaceb95ecf25a5bd87ffcfd1b7b21 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "ash/common/session/session_controller.h"
#include "ash/common/shelf/shelf_controller.h"
#include "ash/common/shutdown_controller.h"
#include "ash/common/system/locale/locale_notification_controller.h"
@@ -29,6 +30,11 @@ void BindLocaleNotificationControllerOnMainThread(
std::move(request));
}
+void BindSessionControllerRequestOnMainThread(
+ mojom::SessionControllerRequest request) {
+ WmShell::Get()->session_controller()->BindRequest(std::move(request));
+}
+
void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
WmShell::Get()->shelf_controller()->BindRequest(std::move(request));
}
@@ -63,6 +69,8 @@ void RegisterInterfaces(
registry->AddInterface(
base::Bind(&BindLocaleNotificationControllerOnMainThread),
main_thread_task_runner);
+ registry->AddInterface(base::Bind(&BindSessionControllerRequestOnMainThread),
+ main_thread_task_runner);
registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread),
main_thread_task_runner);
registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread),

Powered by Google App Engine
This is Rietveld 408576698