| Index: third_party/WebKit/Source/core/frame/Settings.h
|
| diff --git a/third_party/WebKit/Source/core/frame/Settings.h b/third_party/WebKit/Source/core/frame/Settings.h
|
| index 6ab18c6ad80aa65ed2861a036b6b3e5aaee118cd..8b909e30797a8d6636aaf468f4fb689760820aa0 100644
|
| --- a/third_party/WebKit/Source/core/frame/Settings.h
|
| +++ b/third_party/WebKit/Source/core/frame/Settings.h
|
| @@ -44,6 +44,7 @@
|
| #include "public/platform/PointerProperties.h"
|
| #include "public/platform/WebDisplayMode.h"
|
| #include "public/platform/WebViewportStyle.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -51,7 +52,7 @@ class CORE_EXPORT Settings {
|
| WTF_MAKE_NONCOPYABLE(Settings);
|
| USING_FAST_MALLOC(Settings);
|
| public:
|
| - static PassOwnPtr<Settings> create();
|
| + static std::unique_ptr<Settings> create();
|
|
|
| GenericFontFamilySettings& genericFontFamilySettings() { return m_genericFontFamilySettings; }
|
| void notifyGenericFontFamilyChange() { invalidate(SettingsDelegate::FontFamilyChange); }
|
|
|