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

Unified Diff: ash/common/mojo_interface_factory.cc

Issue 2497123002: chromeos: Move device shutdown handling out of chrome into ash (Closed)
Patch Set: rebase Created 4 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 | « ash/BUILD.gn ('k') | ash/common/shutdown_controller.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 d6a38b9fee4fd27644d527f627e66c8cc43a0e55..1eef497a426e8ebbdc76d5527cf05a7d0d54961e 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -7,6 +7,7 @@
#include <utility>
#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shutdown_controller.h"
#include "ash/common/system/locale/locale_notification_controller.h"
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/wallpaper/wallpaper_controller.h"
@@ -28,6 +29,11 @@ void BindShelfRequestOnMainThread(mojom::ShelfControllerRequest request) {
WmShell::Get()->shelf_controller()->BindRequest(std::move(request));
}
+void BindShutdownControllerRequestOnMainThread(
+ mojom::ShutdownControllerRequest request) {
+ WmShell::Get()->shutdown_controller()->BindRequest(std::move(request));
+}
+
void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
WmShell::Get()->system_tray_controller()->BindRequest(std::move(request));
}
@@ -49,6 +55,8 @@ void RegisterInterfaces(
main_thread_task_runner);
registry->AddInterface(base::Bind(&BindShelfRequestOnMainThread),
main_thread_task_runner);
+ registry->AddInterface(base::Bind(&BindShutdownControllerRequestOnMainThread),
+ main_thread_task_runner);
registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread),
main_thread_task_runner);
registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
« no previous file with comments | « ash/BUILD.gn ('k') | ash/common/shutdown_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698