diff options
Diffstat (limited to 'components/content_settings/core/browser/content_settings_policy_provider.cc')
| -rw-r--r-- | components/content_settings/core/browser/content_settings_policy_provider.cc | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc index 6be1a81..7b3faee 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -28,25 +28,26 @@ const char* kPrefToManageType[] = { prefs::kManagedDefaultPopupsSetting, prefs::kManagedDefaultGeolocationSetting, prefs::kManagedDefaultNotificationsSetting, - NULL, // No policy for default value of content type auto-select-certificate - NULL, // No policy for default value of fullscreen requests - NULL, // No policy for default value of mouse lock requests - NULL, // No policy for default value of mixed script blocking - NULL, // The MEDIASTREAM setting is deprecated + nullptr, // No policy for default value of auto select certificate + nullptr, // No policy for default value of fullscreen requests + nullptr, // No policy for default value of mouse lock requests + nullptr, // No policy for default value of mixed script blocking + nullptr, // The MEDIASTREAM setting is deprecated prefs::kManagedDefaultMediaStreamSetting, prefs::kManagedDefaultMediaStreamSetting, - NULL, // No policy for default value of protocol handlers - NULL, // No policy for default value of PPAPI broker - NULL, // No policy for default value of multiple automatic downloads - NULL, // No policy for default value of MIDI system exclusive requests - NULL, // No policy for default value of push messaging requests - NULL, // No policy for default value of SSL certificate decisions + nullptr, // No policy for default value of protocol handlers + nullptr, // No policy for default value of PPAPI broker + nullptr, // No policy for default value of multiple automatic downloads + nullptr, // No policy for default value of MIDI system exclusive requests + nullptr, // No policy for default value of push messaging requests + nullptr, // No policy for default value of SSL certificate decisions #if defined(OS_WIN) - NULL, // No policy for default value of "switch to desktop" + nullptr, // No policy for default value of "switch to desktop" #elif defined(OS_ANDROID) || defined(OS_CHROMEOS) - NULL, // No policy for default value of protected media identifier + nullptr, // No policy for default value of protected media identifier #endif - NULL, // No policy for default value of app banners + nullptr, // No policy for default value of app banners + nullptr, // No policy for default value of site engagement }; static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES " @@ -226,7 +227,7 @@ void PolicyProvider::GetContentSettingsFromPreferences( DCHECK(pref); DCHECK(pref->IsManaged()); - const base::ListValue* pattern_str_list = NULL; + const base::ListValue* pattern_str_list = nullptr; if (!pref->GetValue()->GetAsList(&pattern_str_list)) { NOTREACHED(); return; @@ -275,7 +276,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences( DCHECK(pref); DCHECK(pref->IsManaged()); - const base::ListValue* pattern_filter_str_list = NULL; + const base::ListValue* pattern_filter_str_list = nullptr; if (!pref->GetValue()->GetAsList(&pattern_filter_str_list)) { NOTREACHED(); return; @@ -318,7 +319,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences( std::string pattern_str; bool pattern_read = pattern_filter_pair->GetStringWithoutPathExpansion( "pattern", &pattern_str); - base::DictionaryValue* cert_filter = NULL; + base::DictionaryValue* cert_filter = nullptr; pattern_filter_pair->GetDictionaryWithoutPathExpansion("filter", &cert_filter); if (!pattern_read || !cert_filter) { @@ -348,7 +349,7 @@ void PolicyProvider::GetAutoSelectCertificateSettingsFromPreferences( void PolicyProvider::ReadManagedDefaultSettings() { for (size_t type = 0; type < arraysize(kPrefToManageType); ++type) { - if (kPrefToManageType[type] == NULL) { + if (kPrefToManageType[type] == nullptr) { continue; } UpdateManagedDefaultSetting(ContentSettingsType(type)); @@ -413,7 +414,7 @@ void PolicyProvider::ShutdownOnUIThread() { if (!prefs_) return; pref_change_registrar_.RemoveAll(); - prefs_ = NULL; + prefs_ = nullptr; } void PolicyProvider::OnPreferenceChanged(const std::string& name) { |