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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 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 "content/browser/renderer_host/media/media_stream_dispatcher_host.h" 5 #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h"
6 6
7 #include "content/common/media/media_stream_messages.h" 7 #include "content/common/media/media_stream_messages.h"
8 #include "content/common/media/media_stream_options.h" 8 #include "content/common/media/media_stream_options.h"
9 9
10 using content::BrowserMessageFilter; 10 using content::BrowserMessageFilter;
11 using content::BrowserThread; 11 using content::BrowserThread;
12 12
13 namespace media_stream { 13 namespace media_stream {
14 14
15 struct MediaStreamDispatcherHost::StreamRequest { 15 struct MediaStreamDispatcherHost::StreamRequest {
16 StreamRequest() : render_view_id(0), page_request_id(0) {} 16 StreamRequest() : render_view_id(0), page_request_id(0) {}
17 StreamRequest(int render_view_id, int page_request_id) 17 StreamRequest(int render_view_id, int page_request_id)
18 : render_view_id(render_view_id), 18 : render_view_id(render_view_id),
19 page_request_id(page_request_id ) { 19 page_request_id(page_request_id ) {
20 } 20 }
21 int render_view_id; 21 int render_view_id;
22 // Id of the request generated by MediaStreamDispatcher. 22 // Id of the request generated by MediaStreamDispatcher.
23 int page_request_id; 23 int page_request_id;
24 }; 24 };
25 25
26 MediaStreamDispatcherHost::MediaStreamDispatcherHost( 26 MediaStreamDispatcherHost::MediaStreamDispatcherHost(
27 content::ResourceContext* resource_context, 27 content::ResourceContext* resource_context,
28 int render_process_id, 28 int render_process_id,
29 AudioManager* audio_manager) 29 media::AudioManager* audio_manager)
30 : resource_context_(resource_context), 30 : resource_context_(resource_context),
31 render_process_id_(render_process_id), 31 render_process_id_(render_process_id),
32 audio_manager_(audio_manager) { 32 audio_manager_(audio_manager) {
33 } 33 }
34 34
35 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() { 35 MediaStreamDispatcherHost::~MediaStreamDispatcherHost() {
36 } 36 }
37 37
38 MediaStreamManager* MediaStreamDispatcherHost::manager() { 38 MediaStreamManager* MediaStreamDispatcherHost::manager() {
39 return MediaStreamManager::GetForResourceContext( 39 return MediaStreamManager::GetForResourceContext(
(...skipping 220 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 StreamMap::iterator it = streams_.find(label); 260 StreamMap::iterator it = streams_.find(label);
261 DCHECK(it != streams_.end()); 261 DCHECK(it != streams_.end());
262 StreamRequest request = it->second; 262 StreamRequest request = it->second;
263 streams_.erase(it); 263 streams_.erase(it);
264 264
265 Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id, 265 Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id,
266 request.page_request_id)); 266 request.page_request_id));
267 } 267 }
268 268
269 } // namespace media_stream 269 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698