Chromium Code Reviews| 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..c32e05a72e32fbeaa45868943aa775dbdd2b1526 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,8 @@ SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() { |
| BrowserList::RemoveObserver(this); |
| StopObservingAppWindowRegistry(); |
| + |
| + DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this); |
|
stevenjb
2017/06/13 17:38:18
It's good practice to test against DBusThreadManag
weidongg
2017/06/13 19:01:39
Ok, I added a flag to indicate whether Initialize(
|
| } |
| void SystemTrayDelegateChromeOS::ShowUserLogin() { |
| @@ -440,6 +445,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(); |
| } |