Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3832)

Unified Diff: chrome/browser/ui/ash/system_tray_client.cc

Issue 2493973003: Display "Restart to update" dialog to Chrome OS users. (Closed)
Patch Set: Rebased CL Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..16f4a9c056c756f0b446e2427e8d7542eb7863f0 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,17 @@ 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;
+ chromeos::SystemTrayDelegateChromeOS* tray =
+ chromeos::SystemTrayDelegateChromeOS::instance();
+ if (tray)
+ component_update = tray->GetFlashUpdateAvailable();
+
+ chrome::RebootPolicy reboot_policy =
+ component_update ? chrome::RebootPolicy::kForceReboot
+ : chrome::RebootPolicy::kOptionalReboot;
+
+ chrome::NotifyAndTerminate(true /* fast_path */, reboot_policy);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698