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

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

Issue 9371025: Move resource_context.h to content/public/browser. Remove the workaround in its destructor since ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 8 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 | 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/browser/resource_context.h" 7 #include "content/public/browser/resource_context.h"
8 #include "content/common/media/media_stream_messages.h" 8 #include "content/common/media/media_stream_messages.h"
9 #include "content/common/media/media_stream_options.h" 9 #include "content/common/media/media_stream_options.h"
10 10
11 using content::BrowserMessageFilter; 11 using content::BrowserMessageFilter;
12 using content::BrowserThread; 12 using content::BrowserThread;
13 13
14 namespace media_stream { 14 namespace media_stream {
15 15
16 struct MediaStreamDispatcherHost::StreamRequest { 16 struct MediaStreamDispatcherHost::StreamRequest {
17 StreamRequest() : render_view_id(0), page_request_id(0) {} 17 StreamRequest() : render_view_id(0), page_request_id(0) {}
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 StreamMap::iterator it = streams_.find(label); 259 StreamMap::iterator it = streams_.find(label);
260 DCHECK(it != streams_.end()); 260 DCHECK(it != streams_.end());
261 StreamRequest request = it->second; 261 StreamRequest request = it->second;
262 streams_.erase(it); 262 streams_.erase(it);
263 263
264 Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id, 264 Send(new MediaStreamMsg_DeviceOpenFailed(request.render_view_id,
265 request.page_request_id)); 265 request.page_request_id));
266 } 266 }
267 267
268 } // namespace media_stream 268 } // namespace media_stream
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698