Chromium Code Reviews

Side by Side Diff: Source/core/mediastream/UserMediaRequest.h

Issue 650063002: Move MediaStream and MediaStreamTrack implementation from modules/mediastream to core/mediastream. Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebased. Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 14 matching lines...)
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef UserMediaRequest_h 31 #ifndef UserMediaRequest_h
32 #define UserMediaRequest_h 32 #define UserMediaRequest_h
33 33
34 #include "core/dom/ActiveDOMObject.h" 34 #include "core/dom/ActiveDOMObject.h"
35 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h" 35 #include "core/mediastream/NavigatorUserMediaErrorCallback.h"
36 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h" 36 #include "core/mediastream/NavigatorUserMediaSuccessCallback.h"
37 #include "platform/mediastream/MediaStreamSource.h" 37 #include "platform/mediastream/MediaStreamSource.h"
38 #include "public/platform/WebMediaConstraints.h" 38 #include "public/platform/WebMediaConstraints.h"
39 #include "wtf/Forward.h" 39 #include "wtf/Forward.h"
40 #include "wtf/PassRefPtr.h" 40 #include "wtf/PassRefPtr.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class Dictionary; 44 class Dictionary;
45 class Document; 45 class Document;
46 class ExceptionState; 46 class ExceptionState;
(...skipping 34 matching lines...)
81 81
82 UserMediaController* m_controller; 82 UserMediaController* m_controller;
83 83
84 Member<NavigatorUserMediaSuccessCallback> m_successCallback; 84 Member<NavigatorUserMediaSuccessCallback> m_successCallback;
85 Member<NavigatorUserMediaErrorCallback> m_errorCallback; 85 Member<NavigatorUserMediaErrorCallback> m_errorCallback;
86 }; 86 };
87 87
88 } // namespace blink 88 } // namespace blink
89 89
90 #endif // UserMediaRequest_h 90 #endif // UserMediaRequest_h
OLDNEW
« no previous file with comments | « Source/core/mediastream/UserMediaController.cpp ('k') | Source/core/mediastream/UserMediaRequest.cpp » ('j') | no next file with comments »

Powered by Google App Engine