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

Unified Diff: chrome/browser/chromeos/chrome_interface_factory.cc

Issue 1984433002: Hook up Chrome's wallpaper picker for mash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 7 months 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
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 f236cfb651b3eec83381fb6713dfb827def71ac8..5f4c6e2c5d52bf40540fd04a08f89296744f18fc 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.cc
+++ b/chrome/browser/chromeos/chrome_interface_factory.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#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/browser_commands.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -64,6 +65,7 @@ ChromeInterfaceFactory::~ChromeInterfaceFactory() {}
bool ChromeInterfaceFactory::AcceptConnection(shell::Connection* connection) {
connection->AddInterface<keyboard::mojom::Keyboard>(this);
connection->AddInterface<mash::mojom::Launchable>(this);
+ connection->AddInterface<ash::mus::mojom::WallpaperManager>(this);
connection->AddInterface<app_list::mojom::AppListPresenter>(this);
return true;
}
@@ -85,6 +87,14 @@ void ChromeInterfaceFactory::Create(shell::Connection* connection,
void ChromeInterfaceFactory::Create(
shell::Connection* connection,
+ ash::mus::mojom::WallpaperManagerRequest request) {
+ if (!wallpaper_manager_)
+ wallpaper_manager_.reset(new ChromeWallpaperManager);
+ wallpaper_manager_->ProcessRequest(std::move(request));
+}
+
+void ChromeInterfaceFactory::Create(
+ shell::Connection* connection,
mojo::InterfaceRequest<app_list::mojom::AppListPresenter> request) {
if (!app_list_presenter_service_)
app_list_presenter_service_.reset(new AppListPresenterService);

Powered by Google App Engine
This is Rietveld 408576698