Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Side by Side Diff: ash/system/chromeos/audio/audio_detailed_view.cc

Issue 1746843002: Persist the user's active audio device choice across chromeos session and reboots. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix nits. Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chromeos/audio/audio_devices_pref_handler.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/chromeos/audio/audio_detailed_view.h" 5 #include "ash/system/chromeos/audio/audio_detailed_view.h"
6 6
7 #include "ash/system/tray/fixed_sized_scroll_view.h" 7 #include "ash/system/tray/fixed_sized_scroll_view.h"
8 #include "ash/system/tray/hover_highlight_view.h" 8 #include "ash/system/tray/hover_highlight_view.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 scroller()->Layout(); 160 scroller()->Layout();
161 } 161 }
162 162
163 void AudioDetailedView::OnViewClicked(views::View* sender) { 163 void AudioDetailedView::OnViewClicked(views::View* sender) {
164 if (sender == footer()->content()) { 164 if (sender == footer()->content()) {
165 TransitionToDefaultView(); 165 TransitionToDefaultView();
166 } else { 166 } else {
167 AudioDeviceMap::iterator iter = device_map_.find(sender); 167 AudioDeviceMap::iterator iter = device_map_.find(sender);
168 if (iter == device_map_.end()) 168 if (iter == device_map_.end())
169 return; 169 return;
170 chromeos::AudioDevice& device = iter->second; 170 chromeos::AudioDevice device = iter->second;
171 CrasAudioHandler::Get()->SwitchToDevice(device, true); 171 CrasAudioHandler::Get()->SwitchToDevice(device, true,
172 CrasAudioHandler::ACTIVATE_BY_USER);
172 } 173 }
173 } 174 }
174 175
175 } // namespace tray 176 } // namespace tray
176 } // namespace ash 177 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | chromeos/audio/audio_devices_pref_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698