diff options
Diffstat (limited to 'chromium/chrome/browser/ui/webui/settings/settings_ui.cc')
| -rw-r--r-- | chromium/chrome/browser/ui/webui/settings/settings_ui.cc | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/chromium/chrome/browser/ui/webui/settings/settings_ui.cc b/chromium/chrome/browser/ui/webui/settings/settings_ui.cc index 3ea47f5691e..374bc9896da 100644 --- a/chromium/chrome/browser/ui/webui/settings/settings_ui.cc +++ b/chromium/chrome/browser/ui/webui/settings/settings_ui.cc @@ -47,14 +47,15 @@ #include "chrome/browser/ui/webui/settings/settings_security_key_handler.h" #include "chrome/browser/ui/webui/settings/settings_startup_pages_handler.h" #include "chrome/browser/ui/webui/settings/site_settings_handler.h" +#include "chrome/common/chrome_features.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "chrome/grit/settings_resources.h" #include "chrome/grit/settings_resources_map.h" #include "components/favicon_base/favicon_url_parser.h" #include "components/password_manager/core/common/password_manager_features.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "components/safe_browsing/buildflags.h" #include "components/unified_consent/feature.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" @@ -83,6 +84,7 @@ #include "ash/public/cpp/resources/grit/ash_public_unscaled_resources.h" #include "ash/public/cpp/stylus_utils.h" #include "chrome/browser/browser_process.h" +#include "chrome/browser/browser_process_platform_part.h" #include "chrome/browser/chromeos/account_manager/account_manager_util.h" #include "chrome/browser/chromeos/android_sms/android_sms_app_manager.h" #include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h" @@ -93,6 +95,7 @@ #include "chrome/browser/chromeos/multidevice_setup/multidevice_setup_client_factory.h" #include "chrome/browser/chromeos/plugin_vm/plugin_vm_util.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" +#include "chrome/browser/ui/web_applications/system_web_app_ui_utils.h" #include "chrome/browser/ui/webui/chromeos/smb_shares/smb_handler.h" #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" #include "chrome/browser/ui/webui/settings/chromeos/account_manager_handler.h" @@ -124,6 +127,7 @@ #include "chromeos/login/auth/password_visibility_utils.h" #include "chromeos/services/multidevice_setup/public/cpp/prefs.h" #include "chromeos/services/network_config/public/mojom/constants.mojom.h" // nogncheck +#include "chromeos/services/network_config/public/mojom/cros_network_config.mojom.h" // nogncheck #include "components/arc/arc_util.h" #include "components/prefs/pref_service.h" #include "components/user_manager/user.h" @@ -147,11 +151,6 @@ #include "chrome/browser/ui/webui/settings/printing_handler.h" #endif -#if BUILDFLAG(FULL_SAFE_BROWSING) -#include "chrome/browser/safe_browsing/chrome_password_protection_service.h" -#include "chrome/browser/ui/webui/settings/change_password_handler.h" -#endif - namespace settings { // static void SettingsUI::RegisterProfilePrefs( @@ -250,26 +249,20 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) std::make_unique<IncompatibleApplicationsHandler>()); #endif // OS_WIN && BUILDFLAG(GOOGLE_CHROME_BRANDING) - bool password_protection_available = false; -#if BUILDFLAG(FULL_SAFE_BROWSING) - safe_browsing::ChromePasswordProtectionService* password_protection = - safe_browsing::ChromePasswordProtectionService:: - GetPasswordProtectionService(profile); - password_protection_available = !!password_protection; - if (password_protection) { - AddSettingsPageUIHandler( - std::make_unique<ChangePasswordHandler>(profile, password_protection)); - } -#endif - html_source->AddBoolean("passwordProtectionAvailable", - password_protection_available); - #if !defined(OS_CHROMEOS) html_source->AddBoolean( "diceEnabled", AccountConsistencyModeManager::IsDiceEnabledForProfile(profile)); #endif // !defined(OS_CHROMEOS) + html_source->AddBoolean( + "a11yEnhancements", + base::FeatureList::IsEnabled(features::kWebUIA11yEnhancements)); + + html_source->AddBoolean( + "privacySettingsRedesignEnabled", + base::FeatureList::IsEnabled(features::kPrivacySettingsRedesign)); + html_source->AddBoolean("unifiedConsentEnabled", unified_consent::IsUnifiedConsentFeatureEnabled()); @@ -312,6 +305,8 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) if (web_app::SystemWebAppManager::IsEnabled()) { html_source->AddResourcePath("icon-192.png", IDR_SETTINGS_LOGO_192); html_source->AddResourcePath("pwa.html", IDR_PWA_HTML); + web_app::SetManifestRequestFilter(html_source, IDR_SETTINGS_MANIFEST, + IDS_SETTINGS_SETTINGS); } #endif // defined (OS_CHROMEOS) @@ -322,9 +317,6 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) html_source->AddResourcePath("lazy_load.html", IDR_SETTINGS_LAZY_LOAD_VULCANIZED_HTML); html_source->SetDefaultResource(IDR_SETTINGS_VULCANIZED_HTML); -#if defined(OS_CHROMEOS) - html_source->AddResourcePath("manifest.json", IDR_SETTINGS_MANIFEST); -#endif // defined (OS_CHROMEOS) #else // Add all settings resources. for (size_t i = 0; i < kSettingsResourcesSize; ++i) { @@ -334,7 +326,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) html_source->SetDefaultResource(IDR_SETTINGS_SETTINGS_HTML); #endif - AddLocalizedStrings(html_source, profile); + AddLocalizedStrings(html_source, profile, web_ui->GetWebContents()); ManagedUIHandler::Initialize(web_ui, html_source); @@ -534,8 +526,9 @@ void SettingsUI::AddSettingsPageUIHandler( #if defined(OS_CHROMEOS) void SettingsUI::BindCrosNetworkConfig( - chromeos::network_config::mojom::CrosNetworkConfigRequest request) { - ash::GetNetworkConfigService(std::move(request)); + mojo::PendingReceiver<chromeos::network_config::mojom::CrosNetworkConfig> + receiver) { + ash::GetNetworkConfigService(std::move(receiver)); } #endif // defined(OS_CHROMEOS) |