| Index: ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.cc
|
| diff --git a/ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.cc b/ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.cc
|
| index 0ca538dc8714ded4c6c14d9c78a51d40dea4c246..dfe5defd7e4f47eeea6afa708da8bc2b4268be93 100644
|
| --- a/ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.cc
|
| +++ b/ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "ash/common/system/chromeos/audio/tray_audio_delegate_chromeos.h"
|
|
|
| -#include "ash/resources/grit/ash_resources.h"
|
| #include "ash/resources/vector_icons/vector_icons.h"
|
| #include "chromeos/audio/cras_audio_handler.h"
|
| #include "ui/gfx/paint_vector_icon.h"
|
| @@ -26,23 +25,6 @@ int TrayAudioDelegateChromeOs::GetOutputVolumeLevel() {
|
| return CrasAudioHandler::Get()->GetOutputVolumePercent();
|
| }
|
|
|
| -int TrayAudioDelegateChromeOs::GetActiveOutputDeviceIconId() {
|
| - chromeos::AudioDevice device;
|
| - if (!CrasAudioHandler::Get()->GetPrimaryActiveOutputDevice(&device))
|
| - return kNoAudioDeviceIcon;
|
| -
|
| - if (device.type == chromeos::AUDIO_TYPE_HEADPHONE)
|
| - return IDR_AURA_UBER_TRAY_AUDIO_HEADPHONE;
|
| - else if (device.type == chromeos::AUDIO_TYPE_USB)
|
| - return IDR_AURA_UBER_TRAY_AUDIO_USB;
|
| - else if (device.type == chromeos::AUDIO_TYPE_BLUETOOTH)
|
| - return IDR_AURA_UBER_TRAY_AUDIO_BLUETOOTH;
|
| - else if (device.type == chromeos::AUDIO_TYPE_HDMI)
|
| - return IDR_AURA_UBER_TRAY_AUDIO_HDMI;
|
| - else
|
| - return kNoAudioDeviceIcon;
|
| -}
|
| -
|
| const gfx::VectorIcon&
|
| TrayAudioDelegateChromeOs::GetActiveOutputDeviceVectorIcon() {
|
| chromeos::AudioDevice device;
|
|
|