diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-04-14 16:03:59 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-07-06 11:40:12 +0200 |
commit | 96abe0c83c7399cf771eb5155998c706a2243f0e (patch) | |
tree | b936e8a40dc7e3faa1e1e43e34bff2401fbf4f83 /src/core/web_contents_adapter.cpp | |
parent | d488349ee0ecac8a2e5a87a18d249c7b5de39152 (diff) |
Adaptations for Chromium 112
Pick-to: 6.6
Change-Id: I1bb84b20a080d7f615bf0795ac2d97739e99ac1d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/web_contents_adapter.cpp')
-rw-r--r-- | src/core/web_contents_adapter.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp index 6312103f5..515e5d481 100644 --- a/src/core/web_contents_adapter.cpp +++ b/src/core/web_contents_adapter.cpp @@ -152,7 +152,7 @@ static QVariant fromJSValue(const base::Value *result) } break; } - case base::Value::Type::DICTIONARY: + case base::Value::Type::DICT: { if (const auto dict = result->GetIfDict()) { QVariantMap map; @@ -304,6 +304,7 @@ static void deserializeNavigationHistory(QDataStream &input, int *currentIndex, toGurl(virtualUrl), content::Referrer(toGurl(referrerUrl), static_cast<network::mojom::ReferrerPolicy>(referrerPolicy)), absl::nullopt, // optional initiator_origin + absl::nullopt, // optional initiator_base_url // Use a transition type of reload so that we don't incorrectly // increase the typed count. ui::PAGE_TRANSITION_RELOAD, |