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

Side by Side Diff: chromeos/audio/cras_audio_handler.h

Issue 628883002: replace OVERRIDE and FINAL with override and final in chromeos/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 #ifndef CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_ 5 #ifndef CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
6 #define CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_ 6 #define CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
7 7
8 #include <queue> 8 #include <queue>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 195
196 protected: 196 protected:
197 explicit CrasAudioHandler( 197 explicit CrasAudioHandler(
198 scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler); 198 scoped_refptr<AudioDevicesPrefHandler> audio_pref_handler);
199 virtual ~CrasAudioHandler(); 199 virtual ~CrasAudioHandler();
200 200
201 private: 201 private:
202 friend class CrasAudioHandlerTest; 202 friend class CrasAudioHandlerTest;
203 203
204 // CrasAudioClient::Observer overrides. 204 // CrasAudioClient::Observer overrides.
205 virtual void AudioClientRestarted() OVERRIDE; 205 virtual void AudioClientRestarted() override;
206 virtual void NodesChanged() OVERRIDE; 206 virtual void NodesChanged() override;
207 virtual void ActiveOutputNodeChanged(uint64 node_id) OVERRIDE; 207 virtual void ActiveOutputNodeChanged(uint64 node_id) override;
208 virtual void ActiveInputNodeChanged(uint64 node_id) OVERRIDE; 208 virtual void ActiveInputNodeChanged(uint64 node_id) override;
209 209
210 // AudioPrefObserver overrides. 210 // AudioPrefObserver overrides.
211 virtual void OnAudioPolicyPrefChanged() OVERRIDE; 211 virtual void OnAudioPolicyPrefChanged() override;
212 212
213 // SessionManagerClient::Observer overrides. 213 // SessionManagerClient::Observer overrides.
214 virtual void EmitLoginPromptVisibleCalled() OVERRIDE; 214 virtual void EmitLoginPromptVisibleCalled() override;
215 215
216 // Sets the active audio output/input node to the node with |node_id|. 216 // Sets the active audio output/input node to the node with |node_id|.
217 void SetActiveOutputNode(uint64 node_id); 217 void SetActiveOutputNode(uint64 node_id);
218 void SetActiveInputNode(uint64 node_id); 218 void SetActiveInputNode(uint64 node_id);
219 219
220 // Sets up the audio device state based on audio policy and audio settings 220 // Sets up the audio device state based on audio policy and audio settings
221 // saved in prefs. 221 // saved in prefs.
222 void SetupAudioInputState(); 222 void SetupAudioInputState();
223 void SetupAudioOutputState(); 223 void SetupAudioOutputState();
224 224
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 bool log_errors_; 318 bool log_errors_;
319 319
320 base::WeakPtrFactory<CrasAudioHandler> weak_ptr_factory_; 320 base::WeakPtrFactory<CrasAudioHandler> weak_ptr_factory_;
321 321
322 DISALLOW_COPY_AND_ASSIGN(CrasAudioHandler); 322 DISALLOW_COPY_AND_ASSIGN(CrasAudioHandler);
323 }; 323 };
324 324
325 } // namespace chromeos 325 } // namespace chromeos
326 326
327 #endif // CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_ 327 #endif // CHROMEOS_AUDIO_CRAS_AUDIO_HANDLER_H_
OLDNEW
« no previous file with comments | « chromeos/audio/audio_devices_pref_handler_stub.h ('k') | chromeos/audio/cras_audio_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698