diff options
| author | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-11-16 09:31:58 +0100 |
|---|---|---|
| committer | Peter Varga <pvarga@inf.u-szeged.hu> | 2022-11-21 08:27:09 +0000 |
| commit | 351ad7295e4f401a4b2305efcaeefbfc3bbd2f60 (patch) | |
| tree | 3fca9268f624b6b15beb0406c60012c4479b9b7a | |
| parent | f466b08db9a6e8f5df73e714f76e69fd64a4b3a1 (diff) | |
| download | qtwebengine-chromium-351ad7295e4f401a4b2305efcaeefbfc3bbd2f60.tar.gz | |
FIXUP: Add extensions to Qt build and fix it up for building
- chromium_builder_perf is not a dependency of any target.
- We don't use device_signals component yet.
Change-Id: I8bf191317a6421ba4c67ead292298c7476584527
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/443619
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | chromium/BUILD.gn | 2 | ||||
| -rw-r--r-- | chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn index a83d9eead60..e9900059609 100644 --- a/chromium/BUILD.gn +++ b/chromium/BUILD.gn @@ -1651,7 +1651,7 @@ assert( group("chromium_builder_perf") { testonly = true - if (!is_ios && !is_android && !is_castos && !use_qt) { + if (!is_ios && !is_android && !is_castos) { data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", diff --git a/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc b/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc index 6538a7d96cc..df51cb5b0ed 100644 --- a/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc +++ b/chromium/chrome/common/extensions/permissions/chrome_permission_message_rules.cc @@ -278,10 +278,12 @@ class USBDevicesFormatter : public ChromePermissionMessageFormatter { }; int GetEnterpriseReportingPrivatePermissionMessageId() { +#if !defined(TOOLKIT_QT) if (!base::FeatureList::IsEnabled( enterprise_signals::features::kNewEvSignalsEnabled)) { return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE; } +#endif #if BUILDFLAG(IS_WIN) return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN; #elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) |