summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 12:48:22 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-17 12:48:22 +0000
commit66f9c2ba97feb43cb1de8c7f8f68f95d3221d4ae (patch)
tree2f758a0d9a9049398bfa85745ce06f92a688a772 /chrome
parent0e9b60784cae677eab6e207260c2268f4ab55245 (diff)
downloadchromium_src-66f9c2ba97feb43cb1de8c7f8f68f95d3221d4ae.zip
chromium_src-66f9c2ba97feb43cb1de8c7f8f68f95d3221d4ae.tar.gz
chromium_src-66f9c2ba97feb43cb1de8c7f8f68f95d3221d4ae.tar.bz2
[cros] Perform a clean sign out when restart requested on about:flags.
BUG=chromium-os:11782 TEST=manual. Review URL: http://codereview.chromium.org/6507039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@75256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/webui/flags_ui.cc7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/webui/flags_ui.cc b/chrome/browser/webui/flags_ui.cc
index 325bb5d..c959a5a 100644
--- a/chrome/browser/webui/flags_ui.cc
+++ b/chrome/browser/webui/flags_ui.cc
@@ -162,10 +162,17 @@ void FlagsDOMHandler::HandleEnableFlagsExperimentMessage(
}
void FlagsDOMHandler::HandleRestartBrowser(const ListValue* args) {
+#if !defined(OS_CHROMEOS)
// Set the flag to restore state after the restart.
PrefService* pref_service = g_browser_process->local_state();
pref_service->SetBoolean(prefs::kRestartLastSessionOnShutdown, true);
BrowserList::CloseAllBrowsersAndExit();
+#else
+ // For CrOS instead of browser restart (which is not supported) perform a full
+ // sign out. Session will be only restored is user has that setting set.
+ // Same session restore behavior happens in case of full restart after update.
+ BrowserList::GetLastActive()->Exit();
+#endif
}
} // namespace