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

ash/system/update/tray_update.cc

 // Copyright (c) 2012 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 "ash/system/update/tray_update.h"
 
 #include "ash/metrics/user_metrics_action.h"
 #include "ash/public/interfaces/update.mojom.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "ash/shell.h"
@@ skipping 42 matching lines @@
 }
 
 }  // namespace
 
 // static
 bool TrayUpdate::update_required_ = false;
 // static
 mojom::UpdateSeverity TrayUpdate::severity_ = mojom::UpdateSeverity::NONE;
 // static
 bool TrayUpdate::factory_reset_required_ = false;
+mojom::UpdateType TrayUpdate::update_type_ = mojom::UpdateType::SYSTEM;
 
 // The "restart to update" item in the system tray menu.
 class TrayUpdate::UpdateView : public ActionableView {
  public:
   explicit UpdateView(TrayUpdate* owner)
-      : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS) {
+      : ActionableView(owner, TrayPopupInkDropStyle::FILL_BOUNDS),
+        update_label_(nullptr) {
     SetLayoutManager(new views::FillLayout);
 
     ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
     TriView* tri_view = TrayPopupUtils::CreateDefaultRowView();
     AddChildView(tri_view);
     views::ImageView* image = TrayPopupUtils::CreateMainImageView();
     image->SetImage(gfx::CreateVectorIcon(
         kSystemMenuUpdateIcon,
         IconColorForUpdateSeverity(owner->severity_, true)));
     tri_view->AddView(TriView::Container::START, image);
 
-    base::string16 label_text =
-        owner->factory_reset_required_
-            ? bundle.GetLocalizedString(
-                  IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE)
-            : bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
+    base::string16 label_text;
+    if (owner->factory_reset_required_) {
+      label_text = bundle.GetLocalizedString(
+          IDS_ASH_STATUS_TRAY_RESTART_AND_POWERWASH_TO_UPDATE);
+    } else if (owner->update_type_ == mojom::UpdateType::FLASH) {
+      label_text = bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE_FLASH);
+    } else {
+      label_text = bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
+    }
+
     SetAccessibleName(label_text);
-    auto* label = TrayPopupUtils::CreateDefaultLabel();
+    views::Label* label = TrayPopupUtils::CreateDefaultLabel();

[James Cook, 2017/04/19 00:27:28]

nit: just use update_label_ here and below

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

Done.

     label->SetText(label_text);
+    update_label_ = label;
+
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
     style.SetupLabel(label);
     tri_view->AddView(TriView::Container::CENTER, label);
 
     SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~UpdateView() override {}
 
+  views::Label* update_label_;
+
  private:
   // Overridden from ActionableView.
   bool PerformAction(const ui::Event& event) override {
     Shell::Get()->system_tray_controller()->RequestRestartForUpdate();
     ShellPort::Get()->RecordUserMetricsAction(
         UMA_STATUS_AREA_OS_UPDATE_DEFAULT_SELECTED);
     CloseSystemBubble();
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(UpdateView);
 };
 
 TrayUpdate::TrayUpdate(SystemTray* system_tray)
     : TrayImageItem(system_tray, kSystemTrayUpdateIcon, UMA_UPDATE) {}
 
 TrayUpdate::~TrayUpdate() {}
 
 bool TrayUpdate::GetInitialVisibility() {
   // If chrome tells ash there is an update available before this item's system
   // tray is constructed then show the icon.
   return update_required_;
 }
 
 views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
-  return update_required_ ? new UpdateView(this) : nullptr;
+  if (update_required_) {
+    update_view_ = new UpdateView(this);
+    return update_view_;
+  }
+  return nullptr;
+}
+
+void TrayUpdate::DestroyDefaultView() {
+  update_view_ = nullptr;
 }
 
 void TrayUpdate::ShowUpdateIcon(mojom::UpdateSeverity severity,
-                                bool factory_reset_required) {
+                                bool factory_reset_required,
+                                mojom::UpdateType update_type) {
   // Cache update info so we can create the default view when the menu opens.
   update_required_ = true;
   severity_ = severity;
   factory_reset_required_ = factory_reset_required;
+  update_type_ = update_type;
 
   // Show the icon in the tray.
   SetIconColor(IconColorForUpdateSeverity(severity_, false));
   tray_view()->SetVisible(true);
 }
 
+views::Label* TrayUpdate::GetLabelForTesting() {
+  return update_view_ ? update_view_->update_label_ : nullptr;
+}
+
 }  // namespace ash