diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-21 16:01:46 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-03-07 17:08:45 +0000 |
commit | 93ca852dbf00e93c07269e8cca389bc1222130d3 (patch) | |
tree | 62b541249b8908d717f877c9adb811930bd78a24 /src/core/chromium_overrides.cpp | |
parent | a24df8f8e4ef0f99dbf5a6b09451bb39becaf66a (diff) |
Basic adaptation to Chromium 49
Converts types, callbacks and headers to match Chromium 49.
Task-number: QTBUG-51173
Change-Id: I544ef46e187105e250fea1b48b72d2c81a906640
Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
-rw-r--r-- | src/core/chromium_overrides.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 8cff99222..18596c337 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -131,7 +131,7 @@ scoped_ptr<base::ListValue> GetFontList_SlowBlocking() // TODO: Support localized family names. font_list->Append(font_item); } - return font_list.Pass(); + return std::move(font_list); } #if defined(ENABLE_PLUGINS) @@ -166,7 +166,7 @@ namespace net { class SSLPrivateKey { }; class X509Certificate; -scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(X509Certificate* certificate, scoped_refptr<base::SequencedTaskRunner> task_runner) +scoped_ptr<SSLPrivateKey> FetchClientCertPrivateKey(X509Certificate* certificate) { return scoped_ptr<SSLPrivateKey>(); } |