Remove update icon after user confirms download

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/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/strings/grit/ash_strings.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_controller.h"
 #include "ash/system/tray/system_tray_delegate.h"
+#include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/tray_popup_item_style.h"
 #include "ash/system/tray/tray_popup_utils.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
+#include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace {
 
 // Returns the color to use for the update icon when the update severity is
 // |severity|. If |for_menu| is true, the icon color for the system menu is
 // given, otherwise the icon color for the system tray is given.
 SkColor IconColorForUpdateSeverity(mojom::UpdateSeverity severity,
                                    bool for_menu) {
   const SkColor default_color = for_menu ? kMenuIconColor : kTrayIconColor;
@@ skipping 93 matching lines @@
       Shell::Get()->system_tray_controller()->ShowAboutChromeOS();
     }
     CloseSystemBubble();
     return true;
   }
 
   DISALLOW_COPY_AND_ASSIGN(UpdateView);
 };
 
 TrayUpdate::TrayUpdate(SystemTray* system_tray)
-    : TrayImageItem(system_tray, kSystemTrayUpdateIcon, UMA_UPDATE) {}
+    : TrayImageItem(system_tray, kSystemTrayUpdateIcon, UMA_UPDATE) {
+  Shell::Get()->system_tray_notifier()->AddUpdateObserver(this);
+}
 
-TrayUpdate::~TrayUpdate() {}
+TrayUpdate::~TrayUpdate() {
+  Shell::Get()->system_tray_notifier()->RemoveUpdateObserver(this);
+}
 
 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_ || update_over_cellular_available_;
 }
 
 views::View* TrayUpdate::CreateDefaultView(LoginStatus status) {
   if (update_required_ || update_over_cellular_available_) {
     update_view_ = new UpdateView(this);
     return update_view_;
   }
   return nullptr;
 }
 
 void TrayUpdate::OnDefaultViewDestroyed() {
   update_view_ = nullptr;
 }
 
+void TrayUpdate::OnUpdateOverCellularTargetSet(bool success) {
+  if (success) {

[stevenjb, 2017/06/13 17:38:18]

if (!success) return;

[weidongg, 2017/06/13 19:01:39]

Done.

+    tray_view()->SetVisible(false);
+    update_over_cellular_available_ = false;
+    if (update_view_)
+      update_view_->GetWidget()->Close();
+  }
+}
+
 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