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

Unified Diff: ash/desktop_background/wallpaper_resizer.h

Issue 215293003: Move all wallpaper file loading and decoding from DesktopBackgroundController to WallpaperManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang debug build. Created 6 years, 8 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/desktop_background/wallpaper_resizer.h
diff --git a/ash/desktop_background/wallpaper_resizer.h b/ash/desktop_background/wallpaper_resizer.h
index fadfb445f0dca4a4f63ed0853807f3fc393c797e..2b867994921c70082337381cde5119e84ea2b493 100644
--- a/ash/desktop_background/wallpaper_resizer.h
+++ b/ash/desktop_background/wallpaper_resizer.h
@@ -18,6 +18,8 @@ namespace ash {
class WallpaperResizerObserver;
+extern const int kInvalidResourceID;
+
// Stores the current wallpaper data and resize it to |target_size| if needed.
class ASH_EXPORT WallpaperResizer {
public:
@@ -40,6 +42,8 @@ class ASH_EXPORT WallpaperResizer {
uint32_t original_image_id() const { return original_image_id_; }
WallpaperLayout layout() const { return layout_; }
+ int resource_id() const { return resource_id_; }
+
// Called on the UI thread to run Resize() on the worker pool and post an
// OnResizeFinished() task back to the UI thread on completion.
void StartResize();
@@ -63,6 +67,9 @@ class ASH_EXPORT WallpaperResizer {
// Unique identifier corresponding to the original (i.e. pre-resize) |image_|.
uint32_t original_image_id_;
+ // kInvalidResourceID if image was not obtained from resources.
+ const int resource_id_;
+
gfx::Size target_size_;
WallpaperLayout layout_;
« no previous file with comments | « ash/desktop_background/desktop_background_controller_unittest.cc ('k') | ash/desktop_background/wallpaper_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698