Index: chrome/browser/ui/ash/system_tray_client.cc |
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc |
index b295cb24edcb1f42f007c0eade47f470e0b21505..ae3d8805f096e8cd33215e83ba6383b592a0c42f 100644 |
--- a/chrome/browser/ui/ash/system_tray_client.cc |
+++ b/chrome/browser/ui/ash/system_tray_client.cc |
@@ -22,6 +22,7 @@ |
#include "chrome/browser/lifetime/application_lifetime.h" |
#include "chrome/browser/profiles/profile_manager.h" |
#include "chrome/browser/ui/ash/ash_util.h" |
+#include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
#include "chrome/browser/ui/chrome_pages.h" |
#include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
#include "chrome/browser/ui/singleton_tabs.h" |
@@ -316,8 +317,15 @@ void SystemTrayClient::SignOut() { |
} |
void SystemTrayClient::RequestRestartForUpdate() { |
- // We expect that UpdateEngine is in "Reboot for update" state now. |
- chrome::NotifyAndTerminate(true /* fast_path */); |
+ bool component_update = false; |
+#if defined(OS_CHROMEOS) |
James Cook
2016/12/01 20:41:12
These ifdefs are not needed. chrome/browser/ui/ash
Greg K
2016/12/02 01:07:32
Done.
|
+ chromeos::SystemTrayDelegateChromeOS* tray = |
+ chromeos::SystemTrayDelegateChromeOS::Get(); |
+ if (tray) |
+ component_update = tray->GetFlashUpdateAvailable(); |
+#endif // defined(OS_CHROMEOS) |
+ |
+ chrome::NotifyAndTerminate(true /* fast_path */, component_update); |
} |
//////////////////////////////////////////////////////////////////////////////// |