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 41 matching lines @@
 }
 
 }  // namespace
 
 // static
 bool TrayUpdate::update_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->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);
     }
 
     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(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;
   }
 
   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 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_;
   }
   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;
   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