diff options
Diffstat (limited to 'chromium/weblayer/browser/browser_context_impl.cc')
| -rw-r--r-- | chromium/weblayer/browser/browser_context_impl.cc | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/chromium/weblayer/browser/browser_context_impl.cc b/chromium/weblayer/browser/browser_context_impl.cc index bd790631ab0..0e99612fdce 100644 --- a/chromium/weblayer/browser/browser_context_impl.cc +++ b/chromium/weblayer/browser/browser_context_impl.cc @@ -5,6 +5,7 @@ #include "weblayer/browser/browser_context_impl.h" #include "base/threading/thread_restrictions.h" +#include "components/blocked_content/safe_browsing_triggered_popup_blocker.h" #include "components/client_hints/browser/client_hints.h" #include "components/content_settings/core/browser/host_content_settings_map.h" #include "components/download/public/common/in_progress_download_manager.h" @@ -19,7 +20,8 @@ #include "components/prefs/pref_service_factory.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/security_interstitials/content/stateful_ssl_host_state_delegate.h" -#include "components/security_state/core/security_state.h" +#include "components/site_isolation/pref_names.h" +#include "components/site_isolation/site_isolation_policy.h" #include "components/translate/core/browser/translate_pref_names.h" #include "components/translate/core/browser/translate_prefs.h" #include "components/user_prefs/user_prefs.h" @@ -29,6 +31,8 @@ #include "content/public/browser/download_request_utils.h" #include "content/public/browser/resource_context.h" #include "content/public/browser/storage_partition.h" +#include "weblayer/browser/browsing_data_remover_delegate.h" +#include "weblayer/browser/browsing_data_remover_delegate_factory.h" #include "weblayer/browser/client_hints_factory.h" #include "weblayer/browser/permissions/permission_manager_factory.h" #include "weblayer/browser/stateful_ssl_host_state_delegate_factory.h" @@ -38,6 +42,7 @@ #include "base/android/path_utils.h" #include "components/cdm/browser/media_drm_storage_impl.h" // nogncheck #include "components/permissions/contexts/geolocation_permission_context_android.h" +#include "components/unified_consent/pref_names.h" #elif defined(OS_WIN) #include <KnownFolders.h> #include <shlobj.h> @@ -63,6 +68,11 @@ void BindWakeLockProvider( } // namespace +namespace prefs { +// Used to persist the public SettingType::UKM_ENABLED API. +const char kUkmEnabled[] = "weblayer.ukm_enabled"; +} // namespace prefs + class ResourceContextImpl : public content::ResourceContext { public: ResourceContextImpl() = default; @@ -82,6 +92,8 @@ BrowserContextImpl::BrowserContextImpl(ProfileImpl* profile_impl, BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices( this); + + site_isolation::SiteIsolationPolicy::ApplyPersistedIsolatedOrigins(this); } BrowserContextImpl::~BrowserContextImpl() { @@ -178,7 +190,7 @@ BrowserContextImpl::GetBackgroundSyncController() { content::BrowsingDataRemoverDelegate* BrowserContextImpl::GetBrowsingDataRemoverDelegate() { - return nullptr; + return BrowsingDataRemoverDelegateFactory::GetForBrowserContext(this); } download::InProgressDownloadManager* @@ -228,25 +240,32 @@ void BrowserContextImpl::CreateUserPrefService() { void BrowserContextImpl::RegisterPrefs( user_prefs::PrefRegistrySyncable* pref_registry) { + pref_registry->RegisterBooleanPref(prefs::kUkmEnabled, false); + // This pref is used by captive_portal::CaptivePortalService (as well as other // potential use cases in the future, as it is used for various purposes // through //chrome). pref_registry->RegisterBooleanPref( embedder_support::kAlternateErrorPagesEnabled, true); + pref_registry->RegisterListPref( + site_isolation::prefs::kUserTriggeredIsolatedOrigins); StatefulSSLHostStateDelegate::RegisterProfilePrefs(pref_registry); HostContentSettingsMap::RegisterProfilePrefs(pref_registry); safe_browsing::RegisterProfilePrefs(pref_registry); - security_state::RegisterProfilePrefs(pref_registry); language::LanguagePrefs::RegisterProfilePrefs(pref_registry); translate::TranslatePrefs::RegisterProfilePrefs(pref_registry); + blocked_content::SafeBrowsingTriggeredPopupBlocker::RegisterProfilePrefs( + pref_registry); pref_registry->RegisterBooleanPref( - prefs::kOfferTranslateEnabled, true, + ::prefs::kOfferTranslateEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); #if defined(OS_ANDROID) cdm::MediaDrmStorageImpl::RegisterProfilePrefs(pref_registry); permissions::GeolocationPermissionContextAndroid::RegisterProfilePrefs( pref_registry); + pref_registry->RegisterBooleanPref( + unified_consent::prefs::kUrlKeyedAnonymizedDataCollectionEnabled, false); #endif BrowserContextDependencyManager::GetInstance() @@ -261,7 +280,7 @@ class BrowserContextImpl::WebLayerVariationsClient ~WebLayerVariationsClient() override = default; - bool IsIncognito() const override { + bool IsOffTheRecord() const override { return browser_context_->IsOffTheRecord(); } |