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

Side by Side Diff: Source/WebKit/chromium/src/WebUserMediaRequest.cpp

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. 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 are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 16 matching lines...) Expand all
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 #include "config.h" 31 #include "config.h"
32 32
33 #if ENABLE(MEDIA_STREAM) 33 #if ENABLE(MEDIA_STREAM)
34 34
35 #include "WebUserMediaRequest.h" 35 #include "WebUserMediaRequest.h"
36 36
37 #include "Document.h"
38 #include "UserMediaRequest.h" 37 #include "UserMediaRequest.h"
39 #include "WebDocument.h" 38 #include "WebDocument.h"
40 #include "WebSecurityOrigin.h" 39 #include "WebSecurityOrigin.h"
40 #include "core/dom/Document.h"
41 #include "core/page/SecurityOrigin.h" 41 #include "core/page/SecurityOrigin.h"
42 #include "core/platform/mediastream/MediaConstraints.h" 42 #include "core/platform/mediastream/MediaConstraints.h"
43 #include "core/platform/mediastream/MediaStreamDescriptor.h" 43 #include "core/platform/mediastream/MediaStreamDescriptor.h"
44 #include "core/platform/mediastream/MediaStreamSource.h" 44 #include "core/platform/mediastream/MediaStreamSource.h"
45 #include <public/WebMediaConstraints.h> 45 #include <public/WebMediaConstraints.h>
46 #include <public/WebMediaStream.h> 46 #include <public/WebMediaStream.h>
47 #include <public/WebMediaStreamSource.h> 47 #include <public/WebMediaStreamSource.h>
48 #include <public/WebString.h> 48 #include <public/WebString.h>
49 #include <public/WebVector.h> 49 #include <public/WebVector.h>
50 #include <wtf/Vector.h> 50 #include <wtf/Vector.h>
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 125
126 WebUserMediaRequest::operator UserMediaRequest*() const 126 WebUserMediaRequest::operator UserMediaRequest*() const
127 { 127 {
128 return m_private.get(); 128 return m_private.get();
129 } 129 }
130 130
131 } // namespace WebKit 131 } // namespace WebKit
132 132
133 #endif // ENABLE(MEDIA_STREAM) 133 #endif // ENABLE(MEDIA_STREAM)
134 134
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebUserGestureToken.cpp ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698