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

Unified Diff: ash/shell.cc

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
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index aff6467325eb2904db942e38451b7df46ff6cb09..f255afb5225cc1a2d96876f7b8789f8dc5464391 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -239,8 +239,9 @@ class DummyUserWallpaperDelegate : public UserWallpaperDelegate {
virtual ~DummyUserWallpaperDelegate() {}
- virtual const int GetUserWallpaperIndex() OVERRIDE {
- return -1;
+ virtual void SetLoggedInUserWallpaper() OVERRIDE {
+ ash::Shell::GetInstance()->desktop_background_controller()->
+ CreateEmptyWallpaper();
}
virtual void OpenSetWallpaperPage() OVERRIDE {
@@ -785,7 +786,7 @@ void Shell::Init() {
// It needs to be created after OnWindowResized has been called, otherwise the
// widget will not paint when restoring after a browser crash.
- desktop_background_controller_->SetLoggedInUserWallpaper();
+ user_wallpaper_delegate_->SetLoggedInUserWallpaper();
window_modality_controller_.reset(new internal::WindowModalityController);
AddRootWindowEventFilter(window_modality_controller_.get());

Powered by Google App Engine
This is Rietveld 408576698