| Index: ash/desktop_background/desktop_background_controller.h
|
| diff --git a/ash/desktop_background/desktop_background_controller.h b/ash/desktop_background/desktop_background_controller.h
|
| index b0ae8cfea7808d657433c9868aee26ebeb7929ac..4fdeeabe922e09e47d56c3eba9e7189a0ad3219e 100644
|
| --- a/ash/desktop_background/desktop_background_controller.h
|
| +++ b/ash/desktop_background/desktop_background_controller.h
|
| @@ -25,8 +25,9 @@ class UserWallpaperDelegate {
|
| public:
|
| virtual ~UserWallpaperDelegate() {}
|
|
|
| - // Gets the index of user selected wallpaper.
|
| - virtual const int GetUserWallpaperIndex() = 0;
|
| + // Loads logged in user wallpaper asynchronously and sets to current wallpaper
|
| + // after loaded.
|
| + virtual void SetLoggedInUserWallpaper() = 0;
|
|
|
| // Opens the set wallpaper page in the browser.
|
| virtual void OpenSetWallpaperPage() = 0;
|
| @@ -65,14 +66,18 @@ class ASH_EXPORT DesktopBackgroundController {
|
| // Cancels the current wallpaper loading operation.
|
| void CancelPendingWallpaperOperation();
|
|
|
| - // Loads logged in user wallpaper asynchronously and sets to current wallpaper
|
| - // after loaded.
|
| - void SetLoggedInUserWallpaper();
|
| -
|
| // Sets the desktop background to solid color mode and creates a solid color
|
| // layout.
|
| void SetDesktopBackgroundSolidColorMode();
|
|
|
| + // Creates an empty wallpaper. Some tests require a wallpaper widget is ready
|
| + // when running. However, the wallpaper widgets are now created asynchronously
|
| + // . If loading a real wallpaper, there are cases that these tests crash
|
| + // because the required widget is not ready. This function synchronously
|
| + // creates an empty widget for those tests to prevent crashes. An example test
|
| + // is SystemGestureEventFilterTest.ThreeFingerSwipe.
|
| + void CreateEmptyWallpaper();
|
| +
|
| private:
|
| // An operation to asynchronously loads wallpaper.
|
| class WallpaperOperation;
|
| @@ -86,14 +91,6 @@ class ASH_EXPORT DesktopBackgroundController {
|
| // Called after wallpaper loaded successfully.
|
| void OnWallpaperLoadCompleted(scoped_refptr<WallpaperOperation> wo);
|
|
|
| - // Creates an empty wallpaper. Some tests require a wallpaper widget is ready
|
| - // when running. However, the wallpaper widgets are now created asynchronously
|
| - // . If loading a real wallpaper, there are cases that these tests crash
|
| - // because the required widget is not ready. This function synchronously
|
| - // creates an empty widget for those tests to prevent crashes. An example test
|
| - // is SystemGestureEventFilterTest.ThreeFingerSwipe.
|
| - void CreateEmptyWallpaper();
|
| -
|
| aura::RootWindow* root_window_;
|
|
|
| // Can change at runtime.
|
|
|