diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-09-15 17:08:33 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-11-28 13:32:48 +0100 |
commit | 2d002e42a8b6e711e3c9ca5b6dd3611e9d8426ab (patch) | |
tree | 2da22e8e37770c245be1f72f1c454a9c798b8db4 /src/core/chromium_overrides.cpp | |
parent | 4aa1690516fe76630a7cbb4816f56f0da081c596 (diff) |
Adaptations for 104-based
Change-Id: Ieb44b5c98b3342adca38916d8b77c54e8ed8e1d7
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/chromium_overrides.cpp')
-rw-r--r-- | src/core/chromium_overrides.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 76902bbc4..0b79f2dd4 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -45,13 +45,13 @@ class WebContentsView; class WebContentsViewDelegate; class RenderViewHostDelegateView; -WebContentsView* CreateWebContentsView(WebContentsImpl *web_contents, - WebContentsViewDelegate *, +std::unique_ptr<WebContentsView> CreateWebContentsView(WebContentsImpl *web_contents, + std::unique_ptr<WebContentsViewDelegate> delegate, RenderViewHostDelegateView **render_view_host_delegate_view) { QtWebEngineCore::WebContentsViewQt* rv = new QtWebEngineCore::WebContentsViewQt(web_contents); *render_view_host_delegate_view = rv; - return rv; + return std::unique_ptr<WebContentsView>(rv); } #if defined(Q_OS_DARWIN) @@ -79,9 +79,9 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() std::unique_ptr<base::ListValue> font_list(new base::ListValue); for (auto family : QFontDatabase::families()){ - std::unique_ptr<base::ListValue> font_item(new base::ListValue()); - font_item->Append(family.toStdString()); - font_item->Append(family.toStdString()); // localized name. + base::Value::List font_item; + font_item.Append(family.toStdString()); + font_item.Append(family.toStdString()); // localized name. // TODO(yusukes): Support localized family names. font_list->Append(std::move(font_item)); } |