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

Side by Side Diff: chrome/browser/media/media_capture_devices_dispatcher.h

Issue 180633008: Add different error codes for getUserMedia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed comments Created 6 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
7 7
8 #include <deque> 8 #include <deque>
9 #include <list> 9 #include <list>
10 #include <map> 10 #include <map>
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 const content::MediaStreamRequest& request, 186 const content::MediaStreamRequest& request,
187 const content::MediaResponseCallback& callback, 187 const content::MediaResponseCallback& callback,
188 const extensions::Extension* extension); 188 const extensions::Extension* extension);
189 void ProcessRegularMediaAccessRequest( 189 void ProcessRegularMediaAccessRequest(
190 content::WebContents* web_contents, 190 content::WebContents* web_contents,
191 const content::MediaStreamRequest& request, 191 const content::MediaStreamRequest& request,
192 const content::MediaResponseCallback& callback); 192 const content::MediaResponseCallback& callback);
193 void ProcessQueuedAccessRequest(content::WebContents* web_contents); 193 void ProcessQueuedAccessRequest(content::WebContents* web_contents);
194 void OnAccessRequestResponse(content::WebContents* web_contents, 194 void OnAccessRequestResponse(content::WebContents* web_contents,
195 const content::MediaStreamDevices& devices, 195 const content::MediaStreamDevices& devices,
196 content::MediaStreamRequestResult result,
196 scoped_ptr<content::MediaStreamUI> ui); 197 scoped_ptr<content::MediaStreamUI> ui);
197 198
198 // Called by the MediaObserver() functions, executed on UI thread. 199 // Called by the MediaObserver() functions, executed on UI thread.
199 void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices); 200 void UpdateAudioDevicesOnUIThread(const content::MediaStreamDevices& devices);
200 void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices); 201 void UpdateVideoDevicesOnUIThread(const content::MediaStreamDevices& devices);
201 void UpdateMediaRequestStateOnUIThread( 202 void UpdateMediaRequestStateOnUIThread(
202 int render_process_id, 203 int render_process_id,
203 int render_view_id, 204 int render_view_id,
204 int page_request_id, 205 int page_request_id,
205 const GURL& security_origin, 206 const GURL& security_origin,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 int render_view_id; 241 int render_view_id;
241 int page_request_id; 242 int page_request_id;
242 }; 243 };
243 typedef std::list<DesktopCaptureSession> DesktopCaptureSessions; 244 typedef std::list<DesktopCaptureSession> DesktopCaptureSessions;
244 DesktopCaptureSessions desktop_capture_sessions_; 245 DesktopCaptureSessions desktop_capture_sessions_;
245 246
246 DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher); 247 DISALLOW_COPY_AND_ASSIGN(MediaCaptureDevicesDispatcher);
247 }; 248 };
248 249
249 #endif // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_ 250 #endif // CHROME_BROWSER_MEDIA_MEDIA_CAPTURE_DEVICES_DISPATCHER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/media/media_capture_devices_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698