| Index: chrome/browser/chromeos/chrome_interface_factory.h
|
| diff --git a/chrome/browser/chromeos/chrome_interface_factory.h b/chrome/browser/chromeos/chrome_interface_factory.h
|
| index a56e6172e784c7000db0a2b6ac85a06fade42e44..59b038b3c98a2e8632913ba0a9751103283fe0b9 100644
|
| --- a/chrome/browser/chromeos/chrome_interface_factory.h
|
| +++ b/chrome/browser/chromeos/chrome_interface_factory.h
|
| @@ -5,6 +5,7 @@
|
| #ifndef CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
|
| #define CHROME_BROWSER_CHROMEOS_CHROME_INTERFACE_FACTORY_H_
|
|
|
| +#include "ash/mus/public/interfaces/wallpaper.mojom.h"
|
| #include "content/public/common/mojo_shell_connection.h"
|
| #include "mash/public/interfaces/launchable.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| @@ -14,6 +15,7 @@
|
|
|
| class AppListPresenterService;
|
| class ChromeLaunchable;
|
| +class ChromeWallpaperManager;
|
| class KeyboardUIService;
|
|
|
| namespace chromeos {
|
| @@ -21,9 +23,10 @@ namespace chromeos {
|
| // InterfaceFactory for creating all services provided by chrome.
|
| class ChromeInterfaceFactory
|
| : public content::MojoShellConnection::Listener,
|
| + public shell::InterfaceFactory<keyboard::mojom::Keyboard>,
|
| public shell::InterfaceFactory<mash::mojom::Launchable>,
|
| - public shell::InterfaceFactory<app_list::mojom::AppListPresenter>,
|
| - public shell::InterfaceFactory<keyboard::mojom::Keyboard> {
|
| + public shell::InterfaceFactory<ash::mus::mojom::WallpaperManager>,
|
| + public shell::InterfaceFactory<app_list::mojom::AppListPresenter> {
|
| public:
|
| ChromeInterfaceFactory();
|
| ~ChromeInterfaceFactory() override;
|
| @@ -41,6 +44,10 @@ class ChromeInterfaceFactory
|
| void Create(shell::Connection* connection,
|
| mash::mojom::LaunchableRequest request) override;
|
|
|
| + // mojo::InterfaceFactory<ash::mus::mojom::WallpaperManager>
|
| + void Create(shell::Connection* connection,
|
| + ash::mus::mojom::WallpaperManagerRequest request) override;
|
| +
|
| // mojo::InterfaceFactory<app_list::AppListPresenter>:
|
| void Create(shell::Connection* connection,
|
| mojo::InterfaceRequest<app_list::mojom::AppListPresenter> request)
|
| @@ -49,6 +56,7 @@ class ChromeInterfaceFactory
|
| std::unique_ptr<KeyboardUIService> keyboard_ui_service_;
|
| mojo::BindingSet<keyboard::mojom::Keyboard> keyboard_bindings_;
|
| std::unique_ptr<ChromeLaunchable> launchable_;
|
| + std::unique_ptr<ChromeWallpaperManager> wallpaper_manager_;
|
| std::unique_ptr<AppListPresenterService> app_list_presenter_service_;
|
| mojo::BindingSet<app_list::mojom::AppListPresenter>
|
| app_list_presenter_bindings_;
|
|
|