summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 12:17:44 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-19 12:17:44 +0000
commitc280dbfa4ac454575bd47e076e0aa6935bbf1fd0 (patch)
tree6fbb0cc16fdee7e0c474c30ed48353a607b60e64 /chrome/browser/prefs
parent0d28b24bbddcf76e4b254e1cf4c6eacadbcda096 (diff)
downloadchromium_src-c280dbfa4ac454575bd47e076e0aa6935bbf1fd0.zip
chromium_src-c280dbfa4ac454575bd47e076e0aa6935bbf1fd0.tar.gz
chromium_src-c280dbfa4ac454575bd47e076e0aa6935bbf1fd0.tar.bz2
Add policies for periodic reboot and reboot-after-update
This CL adds two new device policies: Reboot after X amount of uptime and reboot when a reboot is necessary to finish applying an update. Such automatic reboots may be delayed by up to 24 hours while Chrome waits for a moment that causes the least disruption to the user (nobody logged in, nobody interacting with the login screen). If no convenient moment comes for 24 hours, a reboot is forced. The implementation persists information so that reboots happen at the expected times even if Chrome crashes in between. There are safeguards against reboot loops due to corrupted information. BUG=chromium-os:36400,177029 TEST=Extensive unit test coverage Review URL: https://chromiumcodereview.appspot.com/12578005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
-rw-r--r--chrome/browser/prefs/browser_prefs.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 731a9a3..2dddab4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -130,6 +130,7 @@
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#include "chrome/browser/chromeos/settings/device_settings_cache.h"
#include "chrome/browser/chromeos/status/data_promo_notification.h"
+#include "chrome/browser/chromeos/system/automatic_reboot_manager.h"
#else
#include "chrome/browser/extensions/default_apps.h"
#endif
@@ -244,6 +245,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
chromeos::ProxyConfigServiceImpl::RegisterPrefs(registry);
chromeos::RegisterDisplayLocalStatePrefs(registry);
chromeos::ServicesCustomizationDocument::RegisterPrefs(registry);
+ chromeos::system::AutomaticRebootManager::RegisterPrefs(registry);
chromeos::UserImageManager::RegisterPrefs(registry);
chromeos::UserManager::RegisterPrefs(registry);
chromeos::WallpaperManager::RegisterPrefs(registry);