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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/UserMediaRequest.h

Issue 2567913002: Rename ActiveDOMObject to SuspendableObject (Closed)
Patch Set: Created 4 years 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 /* 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 13 matching lines...) Expand all
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
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/SuspendableObject.h"
35 #include "modules/ModulesExport.h" 35 #include "modules/ModulesExport.h"
36 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h" 36 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h"
37 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h" 37 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h"
38 #include "platform/mediastream/MediaStreamSource.h" 38 #include "platform/mediastream/MediaStreamSource.h"
39 #include "public/platform/WebMediaConstraints.h" 39 #include "public/platform/WebMediaConstraints.h"
40 #include "wtf/Forward.h" 40 #include "wtf/Forward.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 class Document; 44 class Document;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 Member<UserMediaController> m_controller; 108 Member<UserMediaController> m_controller;
109 109
110 Member<NavigatorUserMediaSuccessCallback> m_successCallback; 110 Member<NavigatorUserMediaSuccessCallback> m_successCallback;
111 Member<NavigatorUserMediaErrorCallback> m_errorCallback; 111 Member<NavigatorUserMediaErrorCallback> m_errorCallback;
112 }; 112 };
113 113
114 } // namespace blink 114 } // namespace blink
115 115
116 #endif // UserMediaRequest_h 116 #endif // UserMediaRequest_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698