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

Unified Diff: ash/desktop_background/desktop_background_controller.h

Issue 10459003: Load user custom wallpaper after browser crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix aura_shell_unittests Created 8 years, 6 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
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/desktop_background/desktop_background_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698