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

Side by Side Diff: content/browser/renderer_host/media/audio_renderer_host.cc

Issue 2696253004: Revert of Switching AudioOutputAuthorizationHandler from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: Created 3 years, 10 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) 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 "content/browser/renderer_host/media/audio_renderer_host.h" 5 #include "content/browser/renderer_host/media/audio_renderer_host.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 base::Bind(callback, frame_exists)); 54 base::Bind(callback, frame_exists));
55 } 55 }
56 56
57 } // namespace 57 } // namespace
58 58
59 /////////////////////////////////////////////////////////////////////////////// 59 ///////////////////////////////////////////////////////////////////////////////
60 // AudioRendererHost implementations. 60 // AudioRendererHost implementations.
61 61
62 AudioRendererHost::AudioRendererHost(int render_process_id, 62 AudioRendererHost::AudioRendererHost(int render_process_id,
63 media::AudioManager* audio_manager, 63 media::AudioManager* audio_manager,
64 media::AudioSystem* audio_system,
65 AudioMirroringManager* mirroring_manager, 64 AudioMirroringManager* mirroring_manager,
66 MediaStreamManager* media_stream_manager, 65 MediaStreamManager* media_stream_manager,
67 const std::string& salt) 66 const std::string& salt)
68 : BrowserMessageFilter(AudioMsgStart), 67 : BrowserMessageFilter(AudioMsgStart),
69 render_process_id_(render_process_id), 68 render_process_id_(render_process_id),
70 audio_manager_(audio_manager), 69 audio_manager_(audio_manager),
71 mirroring_manager_(mirroring_manager), 70 mirroring_manager_(mirroring_manager),
72 media_stream_manager_(media_stream_manager), 71 media_stream_manager_(media_stream_manager),
73 salt_(salt), 72 salt_(salt),
74 validate_render_frame_id_function_(&ValidateRenderFrameId), 73 validate_render_frame_id_function_(&ValidateRenderFrameId),
75 authorization_handler_(audio_system, 74 authorization_handler_(audio_manager_,
76 media_stream_manager, 75 media_stream_manager,
77 render_process_id_, 76 render_process_id_,
78 salt) { 77 salt) {
79 DCHECK(audio_manager_); 78 DCHECK(audio_manager_);
80 } 79 }
81 80
82 AudioRendererHost::~AudioRendererHost() { 81 AudioRendererHost::~AudioRendererHost() {
83 DCHECK_CURRENTLY_ON(BrowserThread::IO); 82 DCHECK_CURRENTLY_ON(BrowserThread::IO);
84 DCHECK(delegates_.empty()); 83 DCHECK(delegates_.empty());
85 } 84 }
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
395 394
396 bool AudioRendererHost::IsAuthorizationStarted(int stream_id) { 395 bool AudioRendererHost::IsAuthorizationStarted(int stream_id) {
397 DCHECK_CURRENTLY_ON(BrowserThread::IO); 396 DCHECK_CURRENTLY_ON(BrowserThread::IO);
398 return authorizations_.find(stream_id) != authorizations_.end(); 397 return authorizations_.find(stream_id) != authorizations_.end();
399 } 398 }
400 399
401 void AudioRendererHost::OverrideDevicePermissionsForTesting(bool has_access) { 400 void AudioRendererHost::OverrideDevicePermissionsForTesting(bool has_access) {
402 authorization_handler_.OverridePermissionsForTesting(has_access); 401 authorization_handler_.OverridePermissionsForTesting(has_access);
403 } 402 }
404 } // namespace content 403 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698