Add update available icon in system tray

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 37 matching lines @@
     default:
       NOTREACHED();
       break;
   }
   return default_color;
 }
 
 }  // namespace
 
 // static
-bool TrayUpdate::update_required_ = false;
+bool TrayUpdate::upgrade_required_ = false;
 // static
 mojom::UpdateSeverity TrayUpdate::severity_ = mojom::UpdateSeverity::NONE;
 // static
 bool TrayUpdate::factory_reset_required_ = false;
+// static
+bool TrayUpdate::update_over_cellular_available_ = 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),
         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;
     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 if (!owner->upgrade_required_ &&
+               owner->update_over_cellular_available_) {
+      label_text = bundle.GetLocalizedString(
+          IDS_ASH_STATUS_TRAY_UPDATE_OVER_CELLULAR_AVAILABLE);
     } else {
       label_text = bundle.GetLocalizedString(IDS_ASH_STATUS_TRAY_UPDATE);
     }
 
     SetAccessibleName(label_text);
     update_label_ = TrayPopupUtils::CreateDefaultLabel();
     update_label_->SetText(label_text);
 
     TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
     style.SetupLabel(update_label_);
     tri_view->AddView(TriView::Container::CENTER, update_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);
+  bool PerformAction(const ui::Event& /* event */) override {
+    DCHECK(upgrade_required_ || update_over_cellular_available_);
+    if (upgrade_required_) {
+      Shell::Get()->system_tray_controller()->RequestRestartForUpdate();
+      ShellPort::Get()->RecordUserMetricsAction(
+          UMA_STATUS_AREA_OS_UPDATE_DEFAULT_SELECTED);
+    } else {
+      // Opens about Chrome OS page, after which checks for update.
+      Shell::Get()->system_tray_controller()->ShowAboutChromeOS();

[weidongg, 2017/05/15 04:54:13]

Here I want to show the about Chrome OS page first. After the page is loaded
completely, the RequestUpdateCheck() is invoked, but I am not sure how to do
this.

[stevenjb, 2017/05/15 18:06:45]

What is the reason for wanting to show the about page first? Triggering both at
the same time seems OK to me...

[weidongg, 2017/05/15 20:06:57]

In the design doc, clicking this icon will bring user to About Chrome OS page
and show an update warning dialog above the page.
But that dialog is only triggered when the page receives signal from update
engine. The signal is broadcasted after RequestUpdateCheck() is called.
So the sequence should be:
About Chrome OS page is loaded completely -> RequestUpdateCheck() is called ->
NEED_PERMISSION_TO_UPDATE is broadcasted by update engine -> About Chrome OS
page shows update warning dialog.

+      Shell::Get()->system_tray_controller()->RequestUpdateCheck();
+    }
     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_;
+  return upgrade_required_ || update_over_cellular_available_;
 }
 
 views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
-  if (update_required_) {
+  if (upgrade_required_ || update_over_cellular_available_) {
     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,
                                 mojom::UpdateType update_type) {
   // Cache update info so we can create the default view when the menu opens.
-  update_required_ = true;
+  upgrade_required_ = true;

[stevenjb, 2017/05/15 18:06:45]

Switching to 'upgrade' just seems confusing to me. We don't use that term here
(or anywhere in this code that I am aware if). |update_required_| seems the most
clear to me.

[weidongg, 2017/05/15 20:06:57]

Ok, I see, I will refactor it back.

   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;
 }
 
+void TrayUpdate::ShowUpdateOverCellularAvailableIcon() {
+  update_over_cellular_available_ = true;
+
+  // TODO(weidongg/691108): adjust severity according the amount of time passing
+  // after update is available over cellular connection.
+  // Use low severity for update available over cellular connection.
+  SetIconColor(IconColorForUpdateSeverity(mojom::UpdateSeverity::LOW, false));
+  tray_view()->SetVisible(true);
+}
+
 }  // namespace ash