diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 00:21:46 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-03 00:21:46 +0000 |
| commit | d510a21530c105ef09aa54448660a6254a5bfee3 (patch) | |
| tree | a4358ac410c673ba91682b9719d17899493a8b74 /chrome/browser/browser_shutdown.cc | |
| parent | 986e5d0c4c7dcde0b099ed8dfbfd804dac642497 (diff) | |
| download | chromium_src-d510a21530c105ef09aa54448660a6254a5bfee3.zip chromium_src-d510a21530c105ef09aa54448660a6254a5bfee3.tar.gz chromium_src-d510a21530c105ef09aa54448660a6254a5bfee3.tar.bz2 | |
Revert 73550 - Restart instead of signout when there are pending updates.
BUG=chromium-os:9782
TEST=Install an update, signout. With this change, we will reboot (installing
the update).
Review URL: http://codereview.chromium.org/6410038
TBR=achuith@chromium.org
Review URL: http://codereview.chromium.org/6312110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73554 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_shutdown.cc')
| -rw-r--r-- | chrome/browser/browser_shutdown.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_shutdown.cc b/chrome/browser/browser_shutdown.cc index 82298a7..5e906c5 100644 --- a/chrome/browser/browser_shutdown.cc +++ b/chrome/browser/browser_shutdown.cc @@ -4,7 +4,6 @@ #include "chrome/browser/browser_shutdown.h" -#include <map> #include <string> #include "base/command_line.h" @@ -33,7 +32,6 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/renderer_host/render_widget_host.h" #include "chrome/browser/service/service_process_control_manager.h" -#include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" @@ -253,7 +251,9 @@ void Shutdown() { UnregisterURLRequestChromeJob(); #if defined(OS_CHROMEOS) - BrowserList::NotifyAndTerminate(false); + if (chromeos::CrosLibrary::Get()->EnsureLoaded()) { + chromeos::CrosLibrary::Get()->GetLoginLibrary()->StopSession(""); + } #endif // Clean up data sources before the UI thread is removed. |