diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 14:19:43 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-13 14:19:43 +0000 |
| commit | 3b68abc4bef8cc2a144cec2af0ce034fbd7f8c03 (patch) | |
| tree | 504e0f16a8f919e0aebdf87e373959d988db5844 /chrome | |
| parent | 39824c52f57acdc5adc625b7c5900c89fc42e351 (diff) | |
| download | chromium_src-3b68abc4bef8cc2a144cec2af0ce034fbd7f8c03.zip chromium_src-3b68abc4bef8cc2a144cec2af0ce034fbd7f8c03.tar.gz chromium_src-3b68abc4bef8cc2a144cec2af0ce034fbd7f8c03.tar.bz2 | |
Fix reboot for update from tray.
BUG=224342
Review URL: https://chromiumcodereview.appspot.com/14639005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/system/ash_system_tray_delegate.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc index 9208c7d..4a71537 100644 --- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc +++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc @@ -649,8 +649,9 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate, DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen(); } - virtual void RequestRestart() OVERRIDE { - DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); + virtual void RequestRestartForUpdate() OVERRIDE { + // We expect that UpdateEngine is in "Reboot for update" state now. + chrome::NotifyAndTerminate(true /* fast path */); } virtual void GetAvailableBluetoothDevices( |