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

Side by Side Diff: extensions/shell/browser/shell_audio_controller_chromeos.cc

Issue 1268593002: Fix the UI issue for showing output muted in ash tray after the device wakes up with hdmi output re… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2454
Patch Set: Created 5 years, 4 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 | « extensions/shell/browser/shell_audio_controller_chromeos.h ('k') | no next file » | 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 "extensions/shell/browser/shell_audio_controller_chromeos.h" 5 #include "extensions/shell/browser/shell_audio_controller_chromeos.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "chromeos/audio/audio_device.h" 9 #include "chromeos/audio/audio_device.h"
10 10
(...skipping 21 matching lines...) Expand all
32 } 32 }
33 33
34 ShellAudioController::~ShellAudioController() { 34 ShellAudioController::~ShellAudioController() {
35 chromeos::CrasAudioHandler::Get()->RemoveAudioObserver(this); 35 chromeos::CrasAudioHandler::Get()->RemoveAudioObserver(this);
36 } 36 }
37 37
38 void ShellAudioController::OnOutputNodeVolumeChanged(uint64_t /* node_id */, 38 void ShellAudioController::OnOutputNodeVolumeChanged(uint64_t /* node_id */,
39 int /* volume */) { 39 int /* volume */) {
40 } 40 }
41 41
42 void ShellAudioController::OnOutputMuteChanged(bool /* mute_on */) { 42 void ShellAudioController::OnOutputMuteChanged(bool /* mute_on */,
43 } 43 bool /* system_adjust */) {}
44 44
45 void ShellAudioController::OnInputNodeGainChanged(uint64_t /* node_id */, 45 void ShellAudioController::OnInputNodeGainChanged(uint64_t /* node_id */,
46 int /* gain */) { 46 int /* gain */) {
47 } 47 }
48 48
49 void ShellAudioController::OnInputMuteChanged(bool /* mute_on */) { 49 void ShellAudioController::OnInputMuteChanged(bool /* mute_on */) {
50 } 50 }
51 51
52 void ShellAudioController::OnAudioNodesChanged() { 52 void ShellAudioController::OnAudioNodesChanged() {
53 VLOG(1) << "Audio nodes changed"; 53 VLOG(1) << "Audio nodes changed";
(...skipping 28 matching lines...) Expand all
82 } 82 }
83 if (best_output && best_output != handler->GetPrimaryActiveOutputNode()) { 83 if (best_output && best_output != handler->GetPrimaryActiveOutputNode()) {
84 const chromeos::AudioDevice* device = GetDevice(devices, best_output); 84 const chromeos::AudioDevice* device = GetDevice(devices, best_output);
85 DCHECK(device); 85 DCHECK(device);
86 VLOG(1) << "Activating output device: " << device->ToString(); 86 VLOG(1) << "Activating output device: " << device->ToString();
87 handler->SwitchToDevice(*device, true); 87 handler->SwitchToDevice(*device, true);
88 } 88 }
89 } 89 }
90 90
91 } // namespace extensions 91 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_audio_controller_chromeos.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698