Add update available icon in system tray

ash/system/update/tray_update.cc

Index: ash/system/update/tray_update.cc
diff --git a/ash/system/update/tray_update.cc b/ash/system/update/tray_update.cc
index fc9c742826a279f211c219cea89ebcdb4cc789c5..6f31decc0a089e5199569188dfb2574fd4540216 100644
--- a/ash/system/update/tray_update.cc
+++ b/ash/system/update/tray_update.cc
@@ -59,6 +59,9 @@ bool TrayUpdate::update_required_ = false;
 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.
@@ -84,6 +87,10 @@ class TrayUpdate::UpdateView : public ActionableView {
           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->update_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);
     }
@@ -105,10 +112,17 @@ class TrayUpdate::UpdateView : public ActionableView {
 
  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(update_required_ || update_over_cellular_available_);
+    if (update_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(
+          true /* check_for_update */);

[stevenjb, 2017/05/17 16:56:31]

This appears to be the only call to ShowAboutChromeOS? If so, remove the
parameter (and update the comment and optionally rename it
ShowAboutChromeOSAndCheckForUpdates, but that's kind of long, a comment is
fine).

[weidongg, 2017/05/17 18:33:37]

Yes, this is the only call. Done.

+    }
     CloseSystemBubble();
     return true;
   }
@@ -124,11 +138,11 @@ 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 update_required_ || update_over_cellular_available_;
 }
 
 views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
-  if (update_required_) {
+  if (update_required_ || update_over_cellular_available_) {
     update_view_ = new UpdateView(this);
     return update_view_;
   }
@@ -157,4 +171,14 @@ 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