| Index: ash/common/system/chromeos/audio/tray_audio_chromeos.cc
|
| diff --git a/ash/common/system/chromeos/audio/tray_audio_chromeos.cc b/ash/common/system/chromeos/audio/tray_audio_chromeos.cc
|
| index 7bae4ce79ed93c8eba93f6d39b36439133aed402..11c1ea498799dfcf158c10edaa521c4140a2f845 100644
|
| --- a/ash/common/system/chromeos/audio/tray_audio_chromeos.cc
|
| +++ b/ash/common/system/chromeos/audio/tray_audio_chromeos.cc
|
| @@ -4,11 +4,12 @@
|
|
|
| #include "ash/common/system/chromeos/audio/tray_audio_chromeos.h"
|
|
|
| +#include "ash/common/dbus_thread_manager_ash.h"
|
| #include "ash/common/system/audio/volume_view.h"
|
| #include "ash/common/system/chromeos/audio/audio_detailed_view.h"
|
| #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"
|
| #include "ash/common/wm_shell.h"
|
| -#include "chromeos/dbus/dbus_thread_manager.h"
|
| +// #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "ui/views/view.h"
|
|
|
| namespace ash {
|
| @@ -21,13 +22,11 @@ TrayAudioChromeOs::TrayAudioChromeOs(SystemTray* system_tray)
|
| system_tray,
|
| std::unique_ptr<TrayAudioDelegate>(new TrayAudioDelegateChromeOs())),
|
| audio_detail_view_(NULL) {
|
| - chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
|
| - this);
|
| + DBusThreadManagerAsh::Get()->GetPowerManagerClient()->AddObserver(this);
|
| }
|
|
|
| TrayAudioChromeOs::~TrayAudioChromeOs() {
|
| - chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(
|
| - this);
|
| + DBusThreadManagerAsh::Get()->GetPowerManagerClient()->RemoveObserver(this);
|
| }
|
|
|
| void TrayAudioChromeOs::Update() {
|
|
|