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/components/error_page/common | |
| 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/components/error_page/common')
| -rw-r--r-- | chromium/components/error_page/common/localized_error.cc | 6 | ||||
| -rw-r--r-- | chromium/components/error_page/common/net_error_info.h | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/chromium/components/error_page/common/localized_error.cc b/chromium/components/error_page/common/localized_error.cc index 1f12beed8de..5bac91b9c26 100644 --- a/chromium/components/error_page/common/localized_error.cc +++ b/chromium/components/error_page/common/localized_error.cc @@ -277,6 +277,12 @@ const LocalizedErrorMap net_error_options[] = { SUGGEST_DISABLE_EXTENSION, SHOW_BUTTON_RELOAD, }, + {net::ERR_BLOCKED_BY_CSP, + IDS_ERRORPAGES_HEADING_BLOCKED, + IDS_ERRORPAGES_SUMMARY_BLOCKED_BY_SECURITY, + SUGGEST_NONE, + SHOW_NO_BUTTONS, + }, {net::ERR_NETWORK_CHANGED, IDS_ERRORPAGES_HEADING_CONNECTION_INTERRUPTED, IDS_ERRORPAGES_SUMMARY_NETWORK_CHANGED, diff --git a/chromium/components/error_page/common/net_error_info.h b/chromium/components/error_page/common/net_error_info.h index e88f9054741..597e8511621 100644 --- a/chromium/components/error_page/common/net_error_info.h +++ b/chromium/components/error_page/common/net_error_info.h @@ -24,7 +24,8 @@ enum NetworkErrorPageEvent { NETWORK_ERROR_PAGE_MORE_BUTTON_CLICKED = 7, // More button clicked. - NETWORK_ERROR_PAGE_BROWSER_INITIATED_RELOAD = 8, // Reload from browser. + // Obsolete: + // NETWORK_ERROR_PAGE_BROWSER_INITIATED_RELOAD = 8, // Reload from browser. // Obsolete values used for when "Show saved copy" and "Reload" buttons were // both shown. |