diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-15 13:16:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:28 +0000 |
| commit | baaab31631dcff6075418c95f0220e8fb207dd50 (patch) | |
| tree | eea3e8e723f0b142965d7c13ce23d061e73d3cc8 /src/core/chromium_overrides.cpp | |
| parent | e462c0919113b7aae0a24fc438bce648c9fbcfc2 (diff) | |
Adaptations to Chromium 52
Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
| -rw-r--r-- | src/core/chromium_overrides.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 18596c337..882f5b1dd 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -119,9 +119,9 @@ void RenderWidgetHostViewBase::GetDefaultScreenInfo(blink::WebScreenInfo* result namespace content { // content/common/font_list.h -scoped_ptr<base::ListValue> GetFontList_SlowBlocking() +std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() { - scoped_ptr<base::ListValue> font_list(new base::ListValue); + std::unique_ptr<base::ListValue> font_list(new base::ListValue); QFontDatabase database; for (auto family : database.families()){ @@ -166,9 +166,9 @@ namespace net { class SSLPrivateKey { }; class X509Certificate; -scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(X509Certificate* certificate) +std::unique_ptr<SSLPrivateKey> FetchClientCertPrivateKey(X509Certificate* certificate) { - return scoped_ptr<SSLPrivateKey>(); + return std::unique_ptr<SSLPrivateKey>(); } } // namespace net |