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/chrome/browser/ui/webui/components | |
| 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/chrome/browser/ui/webui/components')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/components/components_handler.cc | 3 | ||||
| -rw-r--r-- | chromium/chrome/browser/ui/webui/components/components_ui.cc | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/chromium/chrome/browser/ui/webui/components/components_handler.cc b/chromium/chrome/browser/ui/webui/components/components_handler.cc index 504d9bbc6c6..283f8ad5901 100644 --- a/chromium/chrome/browser/ui/webui/components/components_handler.cc +++ b/chromium/chrome/browser/ui/webui/components/components_handler.cc @@ -8,7 +8,8 @@ #include <vector> #include "base/bind.h" -#include "base/logging.h" +#include "base/check.h" +#include "base/notreached.h" #include "base/values.h" #include "chrome/grit/generated_resources.h" #include "components/update_client/crx_update_item.h" diff --git a/chromium/chrome/browser/ui/webui/components/components_ui.cc b/chromium/chrome/browser/ui/webui/components/components_ui.cc index cddfc815037..3eaf975d70c 100644 --- a/chromium/chrome/browser/ui/webui/components/components_ui.cc +++ b/chromium/chrome/browser/ui/webui/components/components_ui.cc @@ -27,6 +27,7 @@ #include "chrome/grit/theme_resources.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" +#include "services/network/public/mojom/content_security_policy.mojom.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" @@ -40,7 +41,8 @@ content::WebUIDataSource* CreateComponentsUIHTMLSource(Profile* profile) { content::WebUIDataSource* source = content::WebUIDataSource::Create(chrome::kChromeUIComponentsHost); - source->OverrideContentSecurityPolicyScriptSrc( + source->OverrideContentSecurityPolicy( + network::mojom::CSPDirectiveName::ScriptSrc, "script-src chrome://resources 'self' 'unsafe-eval';"); static constexpr webui::LocalizedString kStrings[] = { |