| 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 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 14 matching lines...) Expand all Loading... |
| 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 #include "platform/ContentSettingCallbacks.h" | 31 #include "platform/ContentSettingCallbacks.h" |
| 32 | 32 |
| 33 namespace blink { | 33 namespace blink { |
| 34 | 34 |
| 35 PassOwnPtr<ContentSettingCallbacks> ContentSettingCallbacks::create(PassOwnPtr<C
losure> allowed, PassOwnPtr<Closure> denied) | 35 PassOwnPtr<ContentSettingCallbacks> ContentSettingCallbacks::create(PassOwnPtr<S
ameThreadClosure> allowed, PassOwnPtr<SameThreadClosure> denied) |
| 36 { | 36 { |
| 37 return adoptPtr(new ContentSettingCallbacks(std::move(allowed), std::move(de
nied))); | 37 return adoptPtr(new ContentSettingCallbacks(std::move(allowed), std::move(de
nied))); |
| 38 } | 38 } |
| 39 | 39 |
| 40 ContentSettingCallbacks::ContentSettingCallbacks(PassOwnPtr<Closure> allowed, Pa
ssOwnPtr<Closure> denied) | 40 ContentSettingCallbacks::ContentSettingCallbacks(PassOwnPtr<SameThreadClosure> a
llowed, PassOwnPtr<SameThreadClosure> denied) |
| 41 : m_allowed(std::move(allowed)) | 41 : m_allowed(std::move(allowed)) |
| 42 , m_denied(std::move(denied)) | 42 , m_denied(std::move(denied)) |
| 43 { | 43 { |
| 44 } | 44 } |
| 45 | 45 |
| 46 } // namespace blink | 46 } // namespace blink |
| OLD | NEW |