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

Unified Diff: ash/system/tray/system_tray_controller.cc

Issue 2816253002: Display "Restart to update Adobe Flash Player" for Flash updates. (Closed)
Patch Set: Do not point to deleted memory Created 3 years, 8 months 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: ash/system/tray/system_tray_controller.cc
diff --git a/ash/system/tray/system_tray_controller.cc b/ash/system/tray/system_tray_controller.cc
index 022f97a1dc3070c655d5cfd4c8247ed85fed688d..8b40876cc23243a3fb00c52b738ae8d6d0a12a1e 100644
--- a/ash/system/tray/system_tray_controller.cc
+++ b/ash/system/tray/system_tray_controller.cc
@@ -184,14 +184,16 @@ void SystemTrayController::SetUse24HourClock(bool use_24_hour) {
}
void SystemTrayController::ShowUpdateIcon(mojom::UpdateSeverity severity,
- bool factory_reset_required) {
+ bool factory_reset_required,
+ mojom::UpdateType update_type) {
// Show the icon on all displays.
for (WmWindow* root : ShellPort::Get()->GetAllRootWindows()) {
ash::SystemTray* tray = root->GetRootWindowController()->GetSystemTray();
// External monitors might not have a tray yet.
if (!tray)
continue;
- tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required);
+ tray->tray_update()->ShowUpdateIcon(severity, factory_reset_required,
+ update_type);
}
}

Powered by Google App Engine
This is Rietveld 408576698