| Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| index 67648c4cd8ec5af24657641c260d6fc4ac77a25f..71087e0ddce4552e57e489b71ccddd518c85a8fd 100644
|
| --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
|
| @@ -46,6 +46,7 @@
|
| #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"
|
| @@ -119,6 +120,8 @@ void SystemTrayDelegateChromeOS::Initialize() {
|
| ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
|
|
|
| BrowserList::AddObserver(this);
|
| +
|
| + DBusThreadManager::Get()->GetUpdateEngineClient()->AddObserver(this);
|
| }
|
|
|
| SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
|
| @@ -135,6 +138,9 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
|
|
|
| BrowserList::RemoveObserver(this);
|
| StopObservingAppWindowRegistry();
|
| +
|
| + if (DBusThreadManager::IsInitialized())
|
| + DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this);
|
| }
|
|
|
| void SystemTrayDelegateChromeOS::ShowUserLogin() {
|
| @@ -440,6 +446,10 @@ 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();
|
| }
|
|
|