| Index: chrome/browser/chromeos/chrome_interface_factory.cc
|
| diff --git a/chrome/browser/chromeos/chrome_interface_factory.cc b/chrome/browser/chromeos/chrome_interface_factory.cc
|
| index bd79722c180f15c1f417c1d71814e63a2c5ddf46..6411e47cb5fb7572039e095ef5924b46ec6c0db4 100644
|
| --- a/chrome/browser/chromeos/chrome_interface_factory.cc
|
| +++ b/chrome/browser/chromeos/chrome_interface_factory.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/ash/app_list/app_list_presenter_service.h"
|
| #include "chrome/browser/ui/ash/chrome_wallpaper_manager.h"
|
| #include "chrome/browser/ui/ash/keyboard_ui_service.h"
|
| +#include "chrome/browser/ui/ash/system_tray_client.h"
|
| #include "chrome/browser/ui/browser_commands.h"
|
| #include "chrome/browser/ui/browser_finder.h"
|
| #include "content/public/common/mojo_shell_connection.h"
|
| @@ -113,6 +114,11 @@ class FactoryImpl {
|
| launchable_->ProcessRequest(std::move(request));
|
| }
|
|
|
| + void BindRequest(ash::mojom::SystemTrayClientRequest request) {
|
| + system_tray_client_bindings_.AddBinding(SystemTrayClient::Get(),
|
| + std::move(request));
|
| + }
|
| +
|
| void BindRequest(ash::mojom::WallpaperManagerRequest request) {
|
| if (!wallpaper_manager_)
|
| wallpaper_manager_.reset(new ChromeWallpaperManager);
|
| @@ -131,6 +137,7 @@ class FactoryImpl {
|
| std::unique_ptr<KeyboardUIService> keyboard_ui_service_;
|
| mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
|
| std::unique_ptr<ChromeLaunchable> launchable_;
|
| + mojo::BindingSet<ash::mojom::SystemTrayClient> system_tray_client_bindings_;
|
| std::unique_ptr<ChromeWallpaperManager> wallpaper_manager_;
|
| std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
|
| mojo::BindingSet<app_list::mojom::AppListPresenter>
|
| @@ -156,6 +163,8 @@ bool ChromeInterfaceFactory::OnConnect(const shell::Identity& remote_identity,
|
| main_thread_task_runner_);
|
| FactoryImpl::AddFactory<mash::mojom::Launchable>(registry,
|
| main_thread_task_runner_);
|
| + FactoryImpl::AddFactory<ash::mojom::SystemTrayClient>(
|
| + registry, main_thread_task_runner_);
|
| FactoryImpl::AddFactory<ash::mojom::WallpaperManager>(
|
| registry, main_thread_task_runner_);
|
| FactoryImpl::AddFactory<app_list::mojom::AppListPresenter>(
|
|
|