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;
+views::Label* TrayUpdate::update_label_ = nullptr;
 
 // 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) {
     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();
     label->SetText(label_text);
+    update_label_ = label;

[James Cook, 2017/04/18 23:20:57]

update_label_ can point to deleted memory after the tray is closed. Instead of
making this a static, I would either:

* Make it a member of TrayUpdate and set it via |owner| and clear it in the
destructor, or better yet
* Make it a member of this class and make TrayUpdate have a non-static
update_view_ or default_view_ member. CreateDefaultView() can set the pointer
and return it. You'll need to add an override for DestroyDefaultView() that
resets the pointer to null. There should be lots of examples of this.

[Greg K, 2017/04/18 23:45:23]

Done.

+
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
     style.SetupLabel(label);
     tri_view->AddView(TriView::Container::CENTER, label);
 
     SetInkDropMode(InkDropHostView::InkDropMode::ON);
   }
 
   ~UpdateView() override {}
 
  private:
@@ skipping 18 matching lines @@
   // 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;
 }
 
 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);
 }
 
+base::string16 TrayUpdate::GetLabelForTesting() {
+  return update_label_ ? update_label_->text() : base::string16();

[James Cook, 2017/04/18 23:20:57]

Then this could become "return default_view_ ? default_view_->label_ : nullptr"
or similar.

[Greg K, 2017/04/18 23:45:23]

Done.

+}
+
 }  // namespace ash