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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 9703031: Retry landing "Enable users change desktop background image from settings page in Chromeos Aura bui… (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Merge to trunk 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/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 2bc1dc639a14846c3ef9d992788a5624257dcdae..7ca0181660df1dee93ba7acc21e9a2e1c6ebf806 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -68,6 +68,10 @@
#include <gtk/gtk.h>
#endif
+#if defined(OS_CHROMEOS) && defined(USE_ASH)
+#include "chrome/browser/chromeos/background/desktop_background_observer.h"
+#endif
+
#if defined(USE_AURA)
#include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_observer.h"
#include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h"
@@ -408,6 +412,12 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
// In Aura builds this will initialize ash::Shell.
ChromeBrowserMainPartsLinux::PreProfileInit();
+
+#if defined(OS_CHROMEOS) && defined(USE_ASH)
+ // Initialize desktop background observer so that it can receive
+ // LOGIN_USER_CHANGED notification from UserManager.
+ desktop_background_observer_.reset(new chromeos::DesktopBackgroundObserver);
+#endif
}
void ChromeBrowserMainPartsChromeos::PostProfileInit() {
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/login/mock_user_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698