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

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

Issue 2753013002: DCHECK that the security origin for a media request isn't empty (Closed)
Patch Set: DCHECK that the security origin for a media request isn't empty Created 3 years, 8 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
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 <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 }; 51 };
52 52
53 // Elements in this enum should not be deleted or rearranged; the only 53 // Elements in this enum should not be deleted or rearranged; the only
54 // permitted operation is to add new elements before NUM_MEDIA_REQUEST_RESULTS. 54 // permitted operation is to add new elements before NUM_MEDIA_REQUEST_RESULTS.
55 enum MediaStreamRequestResult { 55 enum MediaStreamRequestResult {
56 MEDIA_DEVICE_OK = 0, 56 MEDIA_DEVICE_OK = 0,
57 MEDIA_DEVICE_PERMISSION_DENIED = 1, 57 MEDIA_DEVICE_PERMISSION_DENIED = 1,
58 MEDIA_DEVICE_PERMISSION_DISMISSED = 2, 58 MEDIA_DEVICE_PERMISSION_DISMISSED = 2,
59 MEDIA_DEVICE_INVALID_STATE = 3, 59 MEDIA_DEVICE_INVALID_STATE = 3,
60 MEDIA_DEVICE_NO_HARDWARE = 4, 60 MEDIA_DEVICE_NO_HARDWARE = 4,
61 MEDIA_DEVICE_INVALID_SECURITY_ORIGIN = 5, 61 MEDIA_DEVICE_INVALID_SECURITY_ORIGIN_DEPRECATED = 5,
62 MEDIA_DEVICE_TAB_CAPTURE_FAILURE = 6, 62 MEDIA_DEVICE_TAB_CAPTURE_FAILURE = 6,
63 MEDIA_DEVICE_SCREEN_CAPTURE_FAILURE = 7, 63 MEDIA_DEVICE_SCREEN_CAPTURE_FAILURE = 7,
64 MEDIA_DEVICE_CAPTURE_FAILURE = 8, 64 MEDIA_DEVICE_CAPTURE_FAILURE = 8,
65 MEDIA_DEVICE_CONSTRAINT_NOT_SATISFIED = 9, 65 MEDIA_DEVICE_CONSTRAINT_NOT_SATISFIED = 9,
66 MEDIA_DEVICE_TRACK_START_FAILURE = 10, 66 MEDIA_DEVICE_TRACK_START_FAILURE = 10,
67 MEDIA_DEVICE_NOT_SUPPORTED = 11, 67 MEDIA_DEVICE_NOT_SUPPORTED = 11,
68 MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN = 12, 68 MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN = 12,
69 MEDIA_DEVICE_KILL_SWITCH_ON = 13, 69 MEDIA_DEVICE_KILL_SWITCH_ON = 13,
70 NUM_MEDIA_REQUEST_RESULTS 70 NUM_MEDIA_REQUEST_RESULTS
71 }; 71 };
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 266
267 // Callback used return results of media access requests. 267 // Callback used return results of media access requests.
268 typedef base::Callback<void(const MediaStreamDevices& devices, 268 typedef base::Callback<void(const MediaStreamDevices& devices,
269 content::MediaStreamRequestResult result, 269 content::MediaStreamRequestResult result,
270 std::unique_ptr<MediaStreamUI> ui)> 270 std::unique_ptr<MediaStreamUI> ui)>
271 MediaResponseCallback; 271 MediaResponseCallback;
272 272
273 } // namespace content 273 } // namespace content
274 274
275 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 275 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc/media_permission.cc ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698