| OLD | NEW |
| 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 15 matching lines...) Expand all Loading... |
| 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 UserMediaClientImpl_h | 31 #ifndef UserMediaClientImpl_h |
| 32 #define UserMediaClientImpl_h | 32 #define UserMediaClientImpl_h |
| 33 | 33 |
| 34 #if ENABLE(MEDIA_STREAM) | 34 #if ENABLE(MEDIA_STREAM) |
| 35 | 35 |
| 36 #include "MediaStreamSource.h" | |
| 37 #include "UserMediaClient.h" | 36 #include "UserMediaClient.h" |
| 37 #include "core/platform/mediastream/MediaStreamSource.h" |
| 38 #include <wtf/PassRefPtr.h> | 38 #include <wtf/PassRefPtr.h> |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 class UserMediaRequest; | 41 class UserMediaRequest; |
| 42 } | 42 } |
| 43 | 43 |
| 44 namespace WebKit { | 44 namespace WebKit { |
| 45 | 45 |
| 46 class WebUserMediaClient; | 46 class WebUserMediaClient; |
| 47 class WebViewImpl; | 47 class WebViewImpl; |
| (...skipping 11 matching lines...) Expand all Loading... |
| 59 UserMediaClientImpl(); | 59 UserMediaClientImpl(); |
| 60 | 60 |
| 61 WebUserMediaClient* m_client; | 61 WebUserMediaClient* m_client; |
| 62 }; | 62 }; |
| 63 | 63 |
| 64 } // namespace WebKit | 64 } // namespace WebKit |
| 65 | 65 |
| 66 #endif // ENABLE(MEDIA_STREAM) | 66 #endif // ENABLE(MEDIA_STREAM) |
| 67 | 67 |
| 68 #endif // UserMediaClientImpl_h | 68 #endif // UserMediaClientImpl_h |
| OLD | NEW |