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

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

Issue 10542092: Refactor the content interface for RequestMediaAccessPermission. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: actually remove typedef Created 8 years, 6 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 #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>
11 11
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/callback.h"
jam 2012/06/12 00:29:06 nit: not needed anymore
Evan Stade 2012/06/12 17:34:17 Done.
13 #include "content/common/content_export.h" 14 #include "content/common/content_export.h"
14 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
15 16
16 namespace content { 17 namespace content {
17 18
18 // Types of media streams. 19 // Types of media streams.
19 enum MediaStreamDeviceType { 20 enum MediaStreamDeviceType {
20 MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE = 0, 21 MEDIA_STREAM_DEVICE_TYPE_NO_SERVICE = 0,
21 MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE, 22 MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE,
22 MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE, 23 MEDIA_STREAM_DEVICE_TYPE_VIDEO_CAPTURE,
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 GURL security_origin; 65 GURL security_origin;
65 66
66 // A list of devices present on the user's computer, for each device type 67 // A list of devices present on the user's computer, for each device type
67 // requested. 68 // requested.
68 MediaStreamDeviceMap devices; 69 MediaStreamDeviceMap devices;
69 }; 70 };
70 71
71 } // namespace content 72 } // namespace content
72 73
73 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 74 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698