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

Unified Diff: ash/mus/sysui_application.h

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; test failures. 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: ash/mus/sysui_application.h
diff --git a/ash/mus/sysui_application.h b/ash/mus/sysui_application.h
index 4e8afcee7dca69a0601bf8dbe6e88d3ec96e08dd..8ce34b31f1586b29d72d262b438ef0ccd4ebc372 100644
--- a/ash/mus/sysui_application.h
+++ b/ash/mus/sysui_application.h
@@ -8,6 +8,7 @@
#include <memory>
#include "base/macros.h"
+#include "mash/public/interfaces/wallpaper.mojom.h"
#include "mash/shelf/public/interfaces/shelf.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/shell/public/cpp/shell_client.h"
@@ -20,7 +21,8 @@ class AshInit;
class SysUIApplication
: public shell::ShellClient,
- public shell::InterfaceFactory<mash::shelf::mojom::ShelfController> {
+ public shell::InterfaceFactory<mash::shelf::mojom::ShelfController>,
+ public shell::InterfaceFactory<mash::mojom::WallpaperController> {
public:
SysUIApplication();
~SysUIApplication() override;
@@ -34,14 +36,19 @@ class SysUIApplication
// InterfaceFactory<mash::shelf::mojom::ShelfController>:
void Create(shell::Connection* connection,
- mojo::InterfaceRequest<mash::shelf::mojom::ShelfController>
- request) override;
+ mash::shelf::mojom::ShelfControllerRequest request) override;
+
+ // InterfaceFactory<mash::mojom::WallpaperController>:
+ void Create(shell::Connection* connection,
+ mash::mojom::WallpaperControllerRequest request) override;
mojo::TracingImpl tracing_;
std::unique_ptr<AshInit> ash_init_;
mojo::BindingSet<mash::shelf::mojom::ShelfController>
shelf_controller_bindings_;
+ mojo::BindingSet<mash::mojom::WallpaperController>
+ wallpaper_controller_bindings_;
DISALLOW_COPY_AND_ASSIGN(SysUIApplication);
};

Powered by Google App Engine
This is Rietveld 408576698