third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/ContentSettingCallbacks.h ('k') | third_party/WebKit/Source/platform/ContextMenuItem.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp

diff --git a/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp b/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp

index 76a31438aa96b00949564cfbb8f0271292a6cb8a..74319991041dcfbebb775636568ae7b31b4c3293 100644

--- a/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp

+++ b/third_party/WebKit/Source/platform/ContentSettingCallbacks.cpp

@@ -30,14 +30,11 @@

#include "platform/ContentSettingCallbacks.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

namespace blink {

-std::unique_ptr<ContentSettingCallbacks> ContentSettingCallbacks::create(std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied)

+PassOwnPtr<ContentSettingCallbacks> ContentSettingCallbacks::create(std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied)

{

- return wrapUnique(new ContentSettingCallbacks(std::move(allowed), std::move(denied)));

+ return adoptPtr(new ContentSettingCallbacks(std::move(allowed), std::move(denied)));

}

ContentSettingCallbacks::ContentSettingCallbacks(std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied)