| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
| 31 #include "modules/mediastream/MediaDevicesRequest.h" | 31 #include "modules/mediastream/MediaDevicesRequest.h" |
| 32 #include "platform/weborigin/SecurityOrigin.h" | 32 #include "platform/weborigin/SecurityOrigin.h" |
| 33 #include "public/platform/WebMediaDeviceInfo.h" | 33 #include "public/platform/WebMediaDeviceInfo.h" |
| 34 #include "public/platform/WebString.h" | 34 #include "public/platform/WebString.h" |
| 35 #include "public/platform/WebVector.h" | 35 #include "public/platform/WebVector.h" |
| 36 #include "public/web/WebDocument.h" | 36 #include "public/web/WebDocument.h" |
| 37 #include "public/web/WebSecurityOrigin.h" | 37 #include "public/web/WebSecurityOrigin.h" |
| 38 #include "wtf/Vector.h" | 38 #include "wtf/Vector.h" |
| 39 | 39 |
| 40 using namespace WebCore; | 40 using namespace blink; |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 WebMediaDevicesRequest::WebMediaDevicesRequest(MediaDevicesRequest* request) | 44 WebMediaDevicesRequest::WebMediaDevicesRequest(MediaDevicesRequest* request) |
| 45 : m_private(request) | 45 : m_private(request) |
| 46 { | 46 { |
| 47 } | 47 } |
| 48 | 48 |
| 49 void WebMediaDevicesRequest::reset() | 49 void WebMediaDevicesRequest::reset() |
| 50 { | 50 { |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 { | 85 { |
| 86 m_private = other.m_private; | 86 m_private = other.m_private; |
| 87 } | 87 } |
| 88 | 88 |
| 89 WebMediaDevicesRequest::operator MediaDevicesRequest*() const | 89 WebMediaDevicesRequest::operator MediaDevicesRequest*() const |
| 90 { | 90 { |
| 91 return m_private.get(); | 91 return m_private.get(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 } // namespace blink | 94 } // namespace blink |
| OLD | NEW |