third_party/WebKit/public/platform/WebContentSettingCallbacks.h - Issue 2050123002: 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/public/platform/WebContentSettingCallbacks.h

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

Patch Set: First attempt to land. 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:

Index: third_party/WebKit/public/platform/WebContentSettingCallbacks.h

diff --git a/third_party/WebKit/public/platform/WebContentSettingCallbacks.h b/third_party/WebKit/public/platform/WebContentSettingCallbacks.h

index 7d4f0d3eecae6f81a635683084feecb8fa234110..7bd13b8a07d029c2321f8ff7a8fa84e4e4f9f460 100644

--- a/third_party/WebKit/public/platform/WebContentSettingCallbacks.h

+++ b/third_party/WebKit/public/platform/WebContentSettingCallbacks.h

@@ -8,8 +8,7 @@

#include "WebPrivatePtr.h"

#if INSIDE_BLINK

-#include "wtf/OwnPtr.h"

-#include "wtf/PassOwnPtr.h"

+#include <memory>

#endif

namespace blink {

@@ -32,7 +31,7 @@ public:

BLINK_PLATFORM_EXPORT void assign(const WebContentSettingCallbacks&);

#if INSIDE_BLINK

- BLINK_PLATFORM_EXPORT WebContentSettingCallbacks(WTF::PassOwnPtr<ContentSettingCallbacks>&&);

+ BLINK_PLATFORM_EXPORT WebContentSettingCallbacks(std::unique_ptr<ContentSettingCallbacks>&&);

#endif

BLINK_PLATFORM_EXPORT void doAllow();