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

Side by Side Diff: chrome/browser/chromeos/audio/audio_handler.cc

Issue 10830027: Implement new slider control and disable the volume control when audio is muted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move enum from .h to .cc. Created 8 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 | Annotate | Revision Log
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/chromeos/audio/audio_handler.h" 5 #include "chrome/browser/chromeos/audio/audio_handler.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 SetVolumePercent(mixer_->GetVolumePercent() + adjust_by_percent); 107 SetVolumePercent(mixer_->GetVolumePercent() + adjust_by_percent);
108 } 108 }
109 109
110 bool AudioHandler::IsMuted() { 110 bool AudioHandler::IsMuted() {
111 return mixer_->IsMuted(); 111 return mixer_->IsMuted();
112 } 112 }
113 113
114 void AudioHandler::SetMuted(bool mute) { 114 void AudioHandler::SetMuted(bool mute) {
115 mixer_->SetMuted(mute); 115 mixer_->SetMuted(mute);
116 prefs_->SetInteger(prefs::kAudioMute, mute ? kPrefMuteOn : kPrefMuteOff); 116 prefs_->SetInteger(prefs::kAudioMute, mute ? kPrefMuteOn : kPrefMuteOff);
117 FOR_EACH_OBSERVER(VolumeObserver, volume_observers_, OnVolumeChanged()); 117 FOR_EACH_OBSERVER(VolumeObserver, volume_observers_, OnMuteToggled());
118 } 118 }
119 119
120 void AudioHandler::AddVolumeObserver(VolumeObserver* observer) { 120 void AudioHandler::AddVolumeObserver(VolumeObserver* observer) {
121 volume_observers_.AddObserver(observer); 121 volume_observers_.AddObserver(observer);
122 } 122 }
123 123
124 void AudioHandler::RemoveVolumeObserver(VolumeObserver* observer) { 124 void AudioHandler::RemoveVolumeObserver(VolumeObserver* observer) {
125 volume_observers_.RemoveObserver(observer); 125 volume_observers_.RemoveObserver(observer);
126 } 126 }
127 127
128 AudioHandler::AudioHandler(AudioMixer* mixer) 128 AudioHandler::AudioHandler(AudioMixer* mixer)
129 : mixer_(mixer), 129 : mixer_(mixer),
130 prefs_(g_browser_process->local_state()) { 130 prefs_(g_browser_process->local_state()) {
131 mixer_->SetVolumePercent(prefs_->GetDouble(prefs::kAudioVolumePercent)); 131 mixer_->SetVolumePercent(prefs_->GetDouble(prefs::kAudioVolumePercent));
132 mixer_->SetMuted(prefs_->GetInteger(prefs::kAudioMute) == kPrefMuteOn); 132 mixer_->SetMuted(prefs_->GetInteger(prefs::kAudioMute) == kPrefMuteOn);
133 mixer_->Init(); 133 mixer_->Init();
134 } 134 }
135 135
136 AudioHandler::~AudioHandler() { 136 AudioHandler::~AudioHandler() {
137 mixer_.reset(); 137 mixer_.reset();
138 }; 138 };
139 139
140 } // namespace chromeos 140 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/audio/audio_handler.h ('k') | chrome/browser/chromeos/system/ash_system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698