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

Side by Side Diff: chrome/browser/ui/ash/volume_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 | « chrome/browser/ui/ash/volume_controller_chromeos.h ('k') | chromeos/audio/cras_audio_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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/ash/volume_controller_chromeos.h" 5 #include "chrome/browser/ui/ash/volume_controller_chromeos.h"
6 6
7 #include "ash/ash_switches.h" 7 #include "ash/ash_switches.h"
8 #include "ash/audio/sounds.h" 8 #include "ash/audio/sounds.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 PlayVolumeAdjustSound(); 92 PlayVolumeAdjustSound();
93 } 93 }
94 94
95 void VolumeController::OnOutputNodeVolumeChanged(uint64_t node_id, int volume) { 95 void VolumeController::OnOutputNodeVolumeChanged(uint64_t node_id, int volume) {
96 CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); 96 CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
97 extensions::DispatchVolumeChangedEvent( 97 extensions::DispatchVolumeChangedEvent(
98 audio_handler->GetOutputVolumePercent(), 98 audio_handler->GetOutputVolumePercent(),
99 audio_handler->IsOutputMuted()); 99 audio_handler->IsOutputMuted());
100 } 100 }
101 101
102 void VolumeController::OnOutputMuteChanged(bool /* mute_on */) { 102 void VolumeController::OnOutputMuteChanged(bool /* mute_on */,
103 bool /* system_adjust */) {
103 CrasAudioHandler* audio_handler = CrasAudioHandler::Get(); 104 CrasAudioHandler* audio_handler = CrasAudioHandler::Get();
104 extensions::DispatchVolumeChangedEvent( 105 extensions::DispatchVolumeChangedEvent(
105 audio_handler->GetOutputVolumePercent(), 106 audio_handler->GetOutputVolumePercent(),
106 audio_handler->IsOutputMuted()); 107 audio_handler->IsOutputMuted());
107 } 108 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/volume_controller_chromeos.h ('k') | chromeos/audio/cras_audio_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698