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

Unified Diff: chrome/browser/ui/views/ash/chrome_shell_delegate.cc

Issue 9764012: Restore to user selected wallpaper after browser crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review and fix a segfault when starting chrome after saving data to local state. Created 8 years, 9 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: chrome/browser/ui/views/ash/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
index 7982438c472d018820cfb02b592da418c26c3ae3..f91ad87d273f0be031eca6158d7899959ed1c977 100644
--- a/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/ash/chrome_shell_delegate.cc
@@ -19,6 +19,7 @@
#include "ui/aura/window.h"
#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/background/desktop_background_observer.h"
#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
#include "chrome/browser/chromeos/dbus/power_manager_client.h"
#include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
@@ -109,3 +110,11 @@ ash::SystemTrayDelegate* ChromeShellDelegate::CreateSystemTrayDelegate(
return NULL;
#endif
}
+
+ash::UserWallpaperDelegate* ChromeShellDelegate::CreateUserWallpaperDelegate() {
+#if defined(OS_CHROMEOS)
+ return chromeos::CreateUserWallpaperDelegate();
+#else
+ return NULL;
+#endif
+}

Powered by Google App Engine
This is Rietveld 408576698