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

Side by Side Diff: content/public/common/media_stream_request.h

Issue 34393006: Refactor MediaStreamManager to never output real device id. It now always output sourceId in the fo… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix broken video_capture_host unittests. Addressed justinlinlins comments. Created 7 years, 1 month 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 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 // media_stream_options.h no longer depends on this file. 157 // media_stream_options.h no longer depends on this file.
158 // TODO(vrk,justinlin,wjia): Figure out a way to share this code cleanly between 158 // TODO(vrk,justinlin,wjia): Figure out a way to share this code cleanly between
159 // vanilla WebRTC, Tab Capture, and Pepper Video Capture. Right now there is 159 // vanilla WebRTC, Tab Capture, and Pepper Video Capture. Right now there is
160 // Tab-only stuff and Pepper-only stuff being passed around to all clients, 160 // Tab-only stuff and Pepper-only stuff being passed around to all clients,
161 // which is icky. 161 // which is icky.
162 struct CONTENT_EXPORT MediaStreamRequest { 162 struct CONTENT_EXPORT MediaStreamRequest {
163 MediaStreamRequest( 163 MediaStreamRequest(
164 int render_process_id, 164 int render_process_id,
165 int render_view_id, 165 int render_view_id,
166 int page_request_id, 166 int page_request_id,
167 const std::string& tab_capture_device_id,
168 const GURL& security_origin, 167 const GURL& security_origin,
169 MediaStreamRequestType request_type, 168 MediaStreamRequestType request_type,
170 const std::string& requested_audio_device_id, 169 const std::string& requested_audio_device_id,
171 const std::string& requested_video_device_id, 170 const std::string& requested_video_device_id,
172 MediaStreamType audio_type, 171 MediaStreamType audio_type,
173 MediaStreamType video_type); 172 MediaStreamType video_type);
174 173
175 ~MediaStreamRequest(); 174 ~MediaStreamRequest();
176 175
177 // This is the render process id that will receive the output of a generated 176 // This is the render process id that will receive the output of a generated
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 }; 229 };
231 230
232 // Callback used return results of media access requests. 231 // Callback used return results of media access requests.
233 typedef base::Callback<void( 232 typedef base::Callback<void(
234 const MediaStreamDevices& devices, 233 const MediaStreamDevices& devices,
235 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback; 234 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
236 235
237 } // namespace content 236 } // namespace content
238 237
239 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 238 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698