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

Unified Diff: ash/common/mojo_interface_factory.cc

Issue 2567523002: mash: Have chrome set itself as the app list presenter. (Closed)
Patch Set: Build should work; thanks, Yuzhu! 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 | « no previous file | ash/common/wm_shell.h » ('j') | ash/common/wm_shell.h » ('J')
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 ef0b47f774cee1364c4553741be7a808205622ae..27967024621a94ef4cd4d794de4561e6f94cd923 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -10,6 +10,7 @@
#include "ash/common/cast_config_controller.h"
#include "ash/common/new_window_controller.h"
#include "ash/common/shelf/shelf_controller.h"
+#include "ash/common/shell_delegate.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"
@@ -18,6 +19,7 @@
#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "services/service_manager/public/cpp/interface_registry.h"
+#include "ui/app_list/presenter/app_list.h"
#if defined(OS_CHROMEOS)
#include "ash/common/system/chromeos/network/vpn_list.h"
@@ -32,6 +34,10 @@ void BindAcceleratorControllerRequestOnMainThread(
WmShell::Get()->accelerator_controller()->BindRequest(std::move(request));
}
+void BindAppListRequestOnMainThread(app_list::mojom::AppListRequest request) {
+ WmShell::Get()->app_list()->BindRequest(std::move(request));
+}
+
void BindCastConfigOnMainThread(mojom::CastConfigRequest request) {
WmShell::Get()->cast_config()->BindRequest(std::move(request));
}
@@ -85,6 +91,8 @@ void RegisterInterfaces(
registry->AddInterface(
base::Bind(&BindAcceleratorControllerRequestOnMainThread),
main_thread_task_runner);
+ registry->AddInterface(base::Bind(&BindAppListRequestOnMainThread),
+ main_thread_task_runner);
registry->AddInterface(base::Bind(&BindCastConfigOnMainThread),
main_thread_task_runner);
registry->AddInterface(
« no previous file with comments | « no previous file | ash/common/wm_shell.h » ('j') | ash/common/wm_shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698