Display "Restart to update Adobe Flash Player" for Flash updates.

chrome/browser/ui/ash/system_tray_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/system_tray_client.h"
 
 #include "ash/login_status.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/public/interfaces/constants.mojom.h"
 #include "ash/shell.h"
@@ skipping 362 matching lines @@
   const chrome::RebootPolicy reboot_policy =
       flash_update_available_ ? chrome::RebootPolicy::kForceReboot
                               : chrome::RebootPolicy::kOptionalReboot;
 
   chrome::NotifyAndTerminate(true /* fast_path */, reboot_policy);
 }
 
 void SystemTrayClient::HandleUpdateAvailable() {
   // Show an update icon for Chrome updates and Flash component updates.
   UpgradeDetector* detector = UpgradeDetector::GetInstance();
   DCHECK(detector->notify_upgrade() || flash_update_available_);

[ilja, 2017/04/19 07:50:33]

I feel the logic here (and new code below) while correct is a bit
inverted/brittle, as by default we show FLASH update. I would feel better if
this function by default showed SYSTEM update *or* if the DCHECK leads to an
early exit. Maybe I am overly cautious, but feel we might confuse users in a
failure case with a FLASH notification more than the other way around.

[Greg K, 2017/04/19 21:42:10]

Good point, but I had written the code below to make sure that a system update
has priority over a flash update for the notification. I changed this to return
if there is no update available instead.

 
   // Get the Chrome update severity.
   ash::mojom::UpdateSeverity severity = GetUpdateSeverity(detector);
 
   // Flash updates are low severity unless the Chrome severity is higher.
   if (flash_update_available_)
     severity = std::max(severity, ash::mojom::UpdateSeverity::LOW);
 
-  system_tray_->ShowUpdateIcon(severity, detector->is_factory_reset_required());
+  // Show a string specific to updating flash player if there is no system
+  // update.
+  ash::mojom::UpdateType update_type = detector->notify_upgrade()
+                                           ? ash::mojom::UpdateType::SYSTEM
+                                           : ash::mojom::UpdateType::FLASH;
+
+  system_tray_->ShowUpdateIcon(severity, detector->is_factory_reset_required(),
+                               update_type);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // chromeos::system::SystemClockObserver:
 
 void SystemTrayClient::OnSystemClockChanged(
     chromeos::system::SystemClock* clock) {
   system_tray_->SetUse24HourClock(clock->ShouldUse24HourClock());
 }
 
 void SystemTrayClient::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   DCHECK_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED, type);
   HandleUpdateAvailable();
 }