diff options
| -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) |