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

Unified Diff: ash/common/wallpaper/wallpaper_controller.h

Issue 2559503003: mash: Have chrome set itself as the wallpaper picker. (Closed)
Patch Set: Check for a null service manager connection. Created 4 years 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/common/wallpaper/wallpaper_controller.h
diff --git a/ash/common/wallpaper/wallpaper_controller.h b/ash/common/wallpaper/wallpaper_controller.h
index 2d8ba3937b6503d0c47df121bab666d96c70b934..ac2000f055c68302810668b27999de9a02da0277 100644
--- a/ash/common/wallpaper/wallpaper_controller.h
+++ b/ash/common/wallpaper/wallpaper_controller.h
@@ -56,11 +56,8 @@ class ASH_EXPORT WallpaperController
wallpaper::WallpaperLayout GetWallpaperLayout() const;
- // Sets wallpaper. This is mostly called by WallpaperManager to set
- // the default or user selected custom wallpaper.
- // Returns true if new image was actually set. And false when duplicate set
- // request detected.
- bool SetWallpaperImage(const gfx::ImageSkia& image,
+ // Sets the wallpaper and alerts observers of changes.
+ void SetWallpaperImage(const gfx::ImageSkia& image,
wallpaper::WallpaperLayout layout);
// Creates an empty wallpaper. Some tests require a wallpaper widget is ready
@@ -106,6 +103,7 @@ class ASH_EXPORT WallpaperController
void OpenSetWallpaperPage();
// mojom::WallpaperController overrides:
+ void SetWallpaperPicker(mojom::WallpaperPickerPtr picker) override;
void SetWallpaper(const SkBitmap& wallpaper,
wallpaper::WallpaperLayout layout) override;
@@ -131,6 +129,9 @@ class ASH_EXPORT WallpaperController
WallpaperMode wallpaper_mode_;
+ // Wallpaper picker interface in chrome browser, used to open the picker.
+ mojom::WallpaperPickerPtr wallpaper_picker_;
+
// Bindings for the WallpaperController interface.
mojo::BindingSet<mojom::WallpaperController> bindings_;
« no previous file with comments | « no previous file | ash/common/wallpaper/wallpaper_controller.cc » ('j') | ash/common/wallpaper/wallpaper_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698