diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/content/browser/conversions/conversion_host.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/content/browser/conversions/conversion_host.cc')
| -rw-r--r-- | chromium/content/browser/conversions/conversion_host.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/chromium/content/browser/conversions/conversion_host.cc b/chromium/content/browser/conversions/conversion_host.cc index 0a695271ca4..f20c780d2f8 100644 --- a/chromium/content/browser/conversions/conversion_host.cc +++ b/chromium/content/browser/conversions/conversion_host.cc @@ -17,8 +17,12 @@ #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/storage_partition_impl.h" #include "content/public/browser/browser_context.h" +#include "content/public/browser/content_browser_client.h" #include "content/public/browser/navigation_handle.h" #include "content/public/browser/render_frame_host.h" +#include "content/public/browser/storage_partition.h" +#include "content/public/browser/web_contents.h" +#include "content/public/common/content_client.h" #include "mojo/public/cpp/bindings/message.h" #include "services/network/public/cpp/is_potentially_trustworthy.h" #include "third_party/blink/public/mojom/devtools/console_message.mojom.h" @@ -150,6 +154,11 @@ void ConversionHost::DidFinishNavigation(NavigationHandle* navigation_handle) { return; } + if (!GetContentClient()->browser()->AllowConversionMeasurement( + web_contents()->GetBrowserContext())) { + return; + } + // Convert |impression| into a StorableImpression that can be forwarded to // storage. If a reporting origin was not provided, default to the conversion // destination for reporting. @@ -208,6 +217,11 @@ void ConversionHost::RegisterConversion( return; } + if (!GetContentClient()->browser()->AllowConversionMeasurement( + web_contents()->GetBrowserContext())) { + return; + } + StorableConversion storable_conversion( conversion_manager->GetConversionPolicy().GetSanitizedConversionData( conversion->conversion_data), |