third_party/WebKit/Source/core/frame/SettingsDelegate.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/Source/core/frame/SettingsDelegate.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/Source/core/frame/SettingsDelegate.h

diff --git a/third_party/WebKit/Source/core/frame/SettingsDelegate.h b/third_party/WebKit/Source/core/frame/SettingsDelegate.h

index 561cfa743fd73880c0d6b74e1abb63005a7c050f..4b37ff97468f398fff4b25a2af2de5844a4a178b 100644

--- a/third_party/WebKit/Source/core/frame/SettingsDelegate.h

+++ b/third_party/WebKit/Source/core/frame/SettingsDelegate.h

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

#include "core/CoreExport.h"

#include "wtf/Allocator.h"

-#include "wtf/OwnPtr.h"

-#include "wtf/PassOwnPtr.h"

+#include <memory>

namespace blink {

@@ -43,7 +42,7 @@ class Settings;

class CORE_EXPORT SettingsDelegate {

DISALLOW_NEW();

public:

- explicit SettingsDelegate(PassOwnPtr<Settings>);

+ explicit SettingsDelegate(std::unique_ptr<Settings>);

virtual ~SettingsDelegate();

Settings* settings() const { return m_settings.get(); }

@@ -67,7 +66,7 @@ public:

virtual void settingsChanged(ChangeType) = 0;

protected:

- OwnPtr<Settings> const m_settings;

+ std::unique_ptr<Settings> const m_settings;

};

} // namespace blink