diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-29 10:46:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-02 12:02:10 +0000 |
| commit | 99677208ff3b216fdfec551fbe548da5520cd6fb (patch) | |
| tree | 476a4865c10320249360e859d8fdd3e01833b03a /chromium/components/cookie_config | |
| parent | c30a6232df03e1efbd9f3b226777b07e087a1122 (diff) | |
| download | qtwebengine-chromium-99677208ff3b216fdfec551fbe548da5520cd6fb.tar.gz | |
BASELINE: Update Chromium to 86.0.4240.124
Change-Id: Ide0ff151e94cd665ae6521a446995d34a9d1d644
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/components/cookie_config')
| -rw-r--r-- | chromium/components/cookie_config/README.md | 2 | ||||
| -rw-r--r-- | chromium/components/cookie_config/cookie_store_util.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chromium/components/cookie_config/README.md b/chromium/components/cookie_config/README.md new file mode 100644 index 00000000000..5a7ae44353d --- /dev/null +++ b/chromium/components/cookie_config/README.md @@ -0,0 +1,2 @@ +Implements a cross-platform net::CookieCryptoDelegate that implements encryption +and decryption of the cookie store if required on a per-platform basis. diff --git a/chromium/components/cookie_config/cookie_store_util.cc b/chromium/components/cookie_config/cookie_store_util.cc index c1aa494335c..aaf6cc22f22 100644 --- a/chromium/components/cookie_config/cookie_store_util.cc +++ b/chromium/components/cookie_config/cookie_store_util.cc @@ -11,7 +11,7 @@ namespace cookie_config { -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) namespace { // Use the operating system's mechanisms to encrypt cookies before writing @@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegate>::DestructorAtExit net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return g_cookie_crypto_delegate.Pointer(); } -#else // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#else // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) net::CookieCryptoDelegate* GetCookieCryptoDelegate() { return NULL; } -#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#endif // defined(OS_WIN) || defined(OS_APPLE) || defined(OS_LINUX) } // namespace cookie_config |