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

Unified Diff: ash/common/mojo_interface_factory.cc

Issue 2513673004: Reland: chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: fix manifest for reland 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/common/BUILD.gn ('k') | ash/common/system/chromeos/network/tray_vpn.cc » ('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 1eef497a426e8ebbdc76d5527cf05a7d0d54961e..f8bab26711a577dd45cc822ecdf41ca7919cfeaf 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -15,6 +15,10 @@
#include "base/bind.h"
#include "services/service_manager/public/cpp/interface_registry.h"
+#if defined(OS_CHROMEOS)
+#include "ash/common/system/chromeos/network/vpn_list.h"
+#endif
+
namespace ash {
namespace {
@@ -38,6 +42,12 @@ void BindSystemTrayRequestOnMainThread(mojom::SystemTrayRequest request) {
WmShell::Get()->system_tray_controller()->BindRequest(std::move(request));
}
+#if defined(OS_CHROMEOS)
+void BindVpnListRequestOnMainThread(mojom::VpnListRequest request) {
+ WmShell::Get()->vpn_list()->BindRequest(std::move(request));
+}
+#endif
+
void BindWallpaperRequestOnMainThread(
mojom::WallpaperControllerRequest request) {
WmShell::Get()->wallpaper_controller()->BindRequest(std::move(request));
@@ -59,6 +69,10 @@ void RegisterInterfaces(
main_thread_task_runner);
registry->AddInterface(base::Bind(&BindSystemTrayRequestOnMainThread),
main_thread_task_runner);
+#if defined(OS_CHROMEOS)
+ registry->AddInterface(base::Bind(&BindVpnListRequestOnMainThread),
+ main_thread_task_runner);
+#endif
registry->AddInterface(base::Bind(&BindWallpaperRequestOnMainThread),
main_thread_task_runner);
}
« no previous file with comments | « ash/common/BUILD.gn ('k') | ash/common/system/chromeos/network/tray_vpn.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698