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 4632067cad966ff81ad8f2e694e967cef7332d91..d2ea6570a02ff59a5412e9dec4a6f81957871de3 100644 |
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc |
@@ -59,6 +59,7 @@ |
#include "chrome/browser/chromeos/power/suspend_observer.h" |
#include "chrome/browser/chromeos/power/user_activity_notifier.h" |
#include "chrome/browser/chromeos/power/video_activity_notifier.h" |
+#include "chrome/browser/chromeos/screensaver/screensaver_controller.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
#include "chrome/browser/chromeos/settings/owner_key_util.h" |
#include "chrome/browser/chromeos/system/statistics_provider.h" |
@@ -602,6 +603,10 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() { |
output_observer_.reset(new OutputObserver()); |
resume_observer_.reset(new ResumeObserver()); |
screen_lock_observer_.reset(new ScreenLockObserver()); |
+ if (CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kEnableScreensaverExtensions)) { |
+ screensaver_controller_.reset(new ScreensaverController()); |
+ } |
suspend_observer_.reset(new SuspendObserver()); |
if (KioskModeSettings::Get()->IsKioskModeEnabled()) { |
power_state_override_ = new PowerStateOverride( |