Index: ash/common/system/chromeos/audio/audio_detailed_view.cc |
diff --git a/ash/common/system/chromeos/audio/audio_detailed_view.cc b/ash/common/system/chromeos/audio/audio_detailed_view.cc |
index 85858b90236403b5f6246bea1603fc90a99769d7..8c8dd74c9282cfc8ce8dc00fca467ef947874866 100644 |
--- a/ash/common/system/chromeos/audio/audio_detailed_view.cc |
+++ b/ash/common/system/chromeos/audio/audio_detailed_view.cc |
@@ -98,9 +98,13 @@ |
return container; |
} |
+void AudioDetailedView::CreateHeaderEntry() { |
+ CreateSpecialRow(IDS_ASH_STATUS_TRAY_AUDIO, this); |
+} |
+ |
void AudioDetailedView::CreateItems() { |
CreateScrollableList(); |
- CreateTitleRow(IDS_ASH_STATUS_TRAY_AUDIO); |
+ CreateHeaderEntry(); |
} |
void AudioDetailedView::UpdateAudioDevices() { |
@@ -150,13 +154,17 @@ |
scroller()->Layout(); |
} |
-void AudioDetailedView::HandleViewClicked(views::View* view) { |
- AudioDeviceMap::iterator iter = device_map_.find(view); |
- if (iter == device_map_.end()) |
- return; |
- chromeos::AudioDevice device = iter->second; |
- CrasAudioHandler::Get()->SwitchToDevice(device, true, |
- CrasAudioHandler::ACTIVATE_BY_USER); |
+void AudioDetailedView::OnViewClicked(views::View* sender) { |
+ if (sender == footer()->content()) { |
+ TransitionToDefaultView(); |
+ } else { |
+ AudioDeviceMap::iterator iter = device_map_.find(sender); |
+ if (iter == device_map_.end()) |
+ return; |
+ chromeos::AudioDevice device = iter->second; |
+ CrasAudioHandler::Get()->SwitchToDevice(device, true, |
+ CrasAudioHandler::ACTIVATE_BY_USER); |
+ } |
} |
} // namespace tray |