Remove update icon after user confirms download

chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 28 matching lines @@
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/networking_config_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/system_tray_client.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 23 matching lines @@
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
   UserAddingScreen::Get()->Start();
 }
 
 }  // namespace
 
 SystemTrayDelegateChromeOS::SystemTrayDelegateChromeOS()
     : networking_config_delegate_(
-          base::MakeUnique<NetworkingConfigDelegateChromeos>()) {
+          base::MakeUnique<NetworkingConfigDelegateChromeos>()),
+      initialized_(false) {
   // Register notifications on construction so that events such as
   // PROFILE_CREATED do not get missed if they happen before Initialize().
   registrar_.reset(new content::NotificationRegistrar);
   if (SystemTrayClient::GetUserLoginStatus() ==
       ash::LoginStatus::NOT_LOGGED_IN) {
     registrar_->Add(this,
                     chrome::NOTIFICATION_SESSION_STARTED,
                     content::NotificationService::AllSources());
   }
   registrar_->Add(this,
                   chrome::NOTIFICATION_PROFILE_CREATED,
                   content::NotificationService::AllSources());
   registrar_->Add(this,
                   chrome::NOTIFICATION_PROFILE_DESTROYED,
                   content::NotificationService::AllSources());
 
   AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
   input_method::InputMethodManager::Get()->AddObserver(this);
   input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
   ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
+  BrowserList::AddObserver(this);
+  DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this);
 
-  BrowserList::AddObserver(this);
+  initialized_ = true;
 }
 
 SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
   user_pref_registrar_.reset();
 
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
-  input_method::InputMethodManager::Get()->RemoveObserver(this);
-  ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
+  StopObservingAppWindowRegistry();
 
-  BrowserList::RemoveObserver(this);
-  StopObservingAppWindowRegistry();
+  if (initialized_) {

[stevenjb, 2017/06/13 20:29:53]

This is not actually what I was suggesting, although if it is possible for
Initialize() to not be called then that is also a good idea.

+    input_method::InputMethodManager::Get()->RemoveObserver(this);
+    input_method::InputMethodManager::Get()->RemoveImeMenuObserver(this);
+    ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
+    BrowserList::RemoveObserver(this);
+    DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this);

[stevenjb, 2017/06/13 20:29:53]

With or without |initiaizled_|, this should be:

if (DBusThreadManager::IsInitialized())
  DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this);

in case DBusThreadManager is destroyed before SystemTrayDelegateChromeOS.

[weidongg, 2017/06/13 20:51:25]

Aha, I see. Thanks for explanation. Done.

+  }
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   if (!ash::Shell::Get()->shell_delegate()->IsMultiProfilesEnabled())
     return;
 
   // Only regular non-supervised users could add other users to current session.
   if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
       user_manager::USER_TYPE_REGULAR) {
     return;
@@ skipping 285 matching lines @@
 void SystemTrayDelegateChromeOS::ImeMenuActivationChanged(bool is_active) {
   GetSystemTrayNotifier()->NotifyRefreshIMEMenu(is_active);
 }
 
 void SystemTrayDelegateChromeOS::ImeMenuListChanged() {}
 
 void SystemTrayDelegateChromeOS::ImeMenuItemsChanged(
     const std::string& engine_id,
     const std::vector<input_method::InputMethodManager::MenuItem>& items) {}
 
+void SystemTrayDelegateChromeOS::OnUpdateOverCellularTargetSet(bool success) {
+  GetSystemTrayNotifier()->NotifyUpdateOverCellularTargetSet(success);
+}
+
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos