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 12 matching lines...) Expand all Loading... |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
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 #include "platform/ContentSettingCallbacks.h" | 31 #include "platform/ContentSettingCallbacks.h" |
32 | 32 |
| 33 #include "wtf/PtrUtil.h" |
| 34 #include <memory> |
| 35 |
33 namespace blink { | 36 namespace blink { |
34 | 37 |
35 PassOwnPtr<ContentSettingCallbacks> ContentSettingCallbacks::create(std::unique_
ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied) | 38 std::unique_ptr<ContentSettingCallbacks> ContentSettingCallbacks::create(std::un
ique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied) |
36 { | 39 { |
37 return adoptPtr(new ContentSettingCallbacks(std::move(allowed), std::move(de
nied))); | 40 return wrapUnique(new ContentSettingCallbacks(std::move(allowed), std::move(
denied))); |
38 } | 41 } |
39 | 42 |
40 ContentSettingCallbacks::ContentSettingCallbacks(std::unique_ptr<SameThreadClosu
re> allowed, std::unique_ptr<SameThreadClosure> denied) | 43 ContentSettingCallbacks::ContentSettingCallbacks(std::unique_ptr<SameThreadClosu
re> allowed, std::unique_ptr<SameThreadClosure> denied) |
41 : m_allowed(std::move(allowed)) | 44 : m_allowed(std::move(allowed)) |
42 , m_denied(std::move(denied)) | 45 , m_denied(std::move(denied)) |
43 { | 46 { |
44 } | 47 } |
45 | 48 |
46 } // namespace blink | 49 } // namespace blink |
OLD | NEW |