Index: ash/common/wallpaper/wallpaper_controller.h |
diff --git a/ash/wallpaper/wallpaper_controller.h b/ash/common/wallpaper/wallpaper_controller.h |
similarity index 92% |
rename from ash/wallpaper/wallpaper_controller.h |
rename to ash/common/wallpaper/wallpaper_controller.h |
index b469e37b1c11994304d6c227e8eda0b3af061dc1..3a4a47b00830bcc2f9e4598381fd380370654a22 100644 |
--- a/ash/wallpaper/wallpaper_controller.h |
+++ b/ash/common/wallpaper/wallpaper_controller.h |
@@ -2,21 +2,22 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ |
-#define ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ |
+#ifndef ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ |
+#define ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ |
#include <memory> |
#include "ash/ash_export.h" |
#include "ash/common/shell_observer.h" |
#include "ash/common/wm_display_observer.h" |
+#include "base/memory/ref_counted.h" |
#include "base/observer_list.h" |
#include "base/timer/timer.h" |
#include "components/wallpaper/wallpaper_layout.h" |
#include "ui/gfx/image/image_skia.h" |
namespace base { |
-class SequencedWorkerPool; |
+class TaskRunner; |
} |
namespace wallpaper { |
@@ -33,7 +34,8 @@ class ASH_EXPORT WallpaperController : public WmDisplayObserver, |
public: |
enum WallpaperMode { WALLPAPER_NONE, WALLPAPER_IMAGE }; |
- explicit WallpaperController(base::SequencedWorkerPool* blocking_pool); |
+ explicit WallpaperController( |
+ const scoped_refptr<base::TaskRunner>& task_runner); |
~WallpaperController() override; |
// Add/Remove observers. |
@@ -124,11 +126,11 @@ class ASH_EXPORT WallpaperController : public WmDisplayObserver, |
int wallpaper_reload_delay_; |
- base::SequencedWorkerPool* blocking_pool_; |
+ scoped_refptr<base::TaskRunner> task_runner_; |
DISALLOW_COPY_AND_ASSIGN(WallpaperController); |
}; |
} // namespace ash |
-#endif // ASH_WALLPAPER_WALLPAPER_CONTROLLER_H_ |
+#endif // ASH_COMMON_WALLPAPER_WALLPAPER_CONTROLLER_H_ |