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

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

Issue 18868005: content: Migrate from googleurl/ includes to url/ ones. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/browser_main_loop.h" 7 #include "content/browser/browser_main_loop.h"
8 #include "content/browser/renderer_host/media/web_contents_capture_util.h" 8 #include "content/browser/renderer_host/media/web_contents_capture_util.h"
9 #include "content/common/media/media_stream_messages.h" 9 #include "content/common/media/media_stream_messages.h"
10 #include "content/common/media/media_stream_options.h" 10 #include "content/common/media/media_stream_options.h"
11 #include "googleurl/src/gurl.h" 11 #include "url/gurl.h"
12 12
13 namespace content { 13 namespace content {
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;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 << security_origin.spec() << ")"; 210 << security_origin.spec() << ")";
211 211
212 const std::string& label = media_stream_manager_->OpenDevice( 212 const std::string& label = media_stream_manager_->OpenDevice(
213 this, render_process_id_, render_view_id, 213 this, render_process_id_, render_view_id,
214 device_id, type, security_origin); 214 device_id, type, security_origin);
215 DCHECK(!label.empty()); 215 DCHECK(!label.empty());
216 streams_[label] = StreamRequest(render_view_id, page_request_id); 216 streams_[label] = StreamRequest(render_view_id, page_request_id);
217 } 217 }
218 218
219 } // namespace content 219 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/clipboard_message_filter.cc ('k') | content/browser/renderer_host/media/media_stream_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698