diff options
author | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 21:12:57 +0000 |
---|---|---|
committer | oshima@google.com <oshima@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 21:12:57 +0000 |
commit | bc63a07355d1e7f57aaad72ef2b2b8359637c55d (patch) | |
tree | ff5fbfa2e0d8586a692268be18a60e1827c21179 /chrome/browser/ui/webui/options/language_options_handler.cc | |
parent | 4c79b45fb6ebeebf308e2286811a714ac1c2fc07 (diff) | |
download | chromium_src-bc63a07355d1e7f57aaad72ef2b2b8359637c55d.zip chromium_src-bc63a07355d1e7f57aaad72ef2b2b8359637c55d.tar.gz chromium_src-bc63a07355d1e7f57aaad72ef2b2b8359637c55d.tar.bz2 |
Don't set exit_cleanly bit early if shutdown can be canceled.
Cleanups:
Added Browser::Restart.
Moved code around to reduce if/defs.
Updated the comment of APP_EXITING to emphasize the difference from APP_TERMINATING.
Review URL: http://codereview.chromium.org/7129027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90839 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/options/language_options_handler.cc')
-rw-r--r-- | chrome/browser/ui/webui/options/language_options_handler.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/ui/webui/options/language_options_handler.cc b/chrome/browser/ui/webui/options/language_options_handler.cc index 31f188b..684d78b 100644 --- a/chrome/browser/ui/webui/options/language_options_handler.cc +++ b/chrome/browser/ui/webui/options/language_options_handler.cc @@ -110,9 +110,5 @@ void LanguageOptionsHandler::SetApplicationLocale( void LanguageOptionsHandler::RestartCallback(const ListValue* args) { UserMetrics::RecordAction(UserMetricsAction("LanguageOptions_Restart")); - - // 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(); + BrowserList::AttemptRestart(); } |