Skip to content

GitLab

T
tangled
Commit df9d9475 authored by msramek's avatar msramek Committed by Commit bot
Browse files
Options

Default Provider style fixes. 

Addressing comments from CL 1004733003.

Review URL: https://codereview.chromium.org/1038203003

Cr-Commit-Position: refs/heads/master@{#324403}
parent d1f5e1f8
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 59 deletions
components/content_settings/core/browser/content_settings_default_provider.cc
View file @ df9d9475
...@@ -39,34 +39,34 @@ struct DefaultContentSettingInfo { ...@@ -39,34 +39,34 @@ struct DefaultContentSettingInfo {
// default content setting. This array must be kept in sync with the enum // default content setting. This array must be kept in sync with the enum
// |ContentSettingsType|. // |ContentSettingsType|.
const DefaultContentSettingInfo kDefaultSettings[] = { const DefaultContentSettingInfo kDefaultSettings[] = {
{prefs::kDefaultCookiesSetting, CONTENT_SETTING_ALLOW, true},
{prefs::kDefaultImagesSetting, CONTENT_SETTING_ALLOW, true}, {prefs::kDefaultCookiesSetting, CONTENT_SETTING_ALLOW, true},
{prefs::kDefaultJavaScriptSetting, CONTENT_SETTING_ALLOW, true}, {prefs::kDefaultImagesSetting, CONTENT_SETTING_ALLOW, true},
{prefs::kDefaultPluginsSetting, CONTENT_SETTING_ALLOW, true}, {prefs::kDefaultJavaScriptSetting, CONTENT_SETTING_ALLOW, true},
{prefs::kDefaultPopupsSetting, CONTENT_SETTING_BLOCK, true}, {prefs::kDefaultPluginsSetting, CONTENT_SETTING_ALLOW, true},
{prefs::kDefaultGeolocationSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultPopupsSetting, CONTENT_SETTING_BLOCK, true},
{prefs::kDefaultNotificationsSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultGeolocationSetting, CONTENT_SETTING_ASK, false},
{prefs::kDefaultAutoSelectCertificateSetting, CONTENT_SETTING_DEFAULT, {prefs::kDefaultNotificationsSetting, CONTENT_SETTING_ASK, false},
false}, {prefs::kDefaultAutoSelectCertificateSetting, CONTENT_SETTING_DEFAULT, false},
{prefs::kDefaultFullScreenSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultFullScreenSetting, CONTENT_SETTING_ASK, true},
{prefs::kDefaultMouseLockSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultMouseLockSetting, CONTENT_SETTING_ASK, true},
{prefs::kDefaultMixedScriptSetting, CONTENT_SETTING_DEFAULT, true}, {prefs::kDefaultMixedScriptSetting, CONTENT_SETTING_DEFAULT, true},
{prefs::kDefaultMediaStreamSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultMediaStreamSetting, CONTENT_SETTING_ASK, false},
{prefs::kDefaultMediaStreamMicSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultMediaStreamMicSetting, CONTENT_SETTING_ASK, false},
{prefs::kDefaultMediaStreamCameraSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultMediaStreamCameraSetting, CONTENT_SETTING_ASK, false},
{prefs::kDefaultProtocolHandlersSetting, CONTENT_SETTING_DEFAULT, true}, {prefs::kDefaultProtocolHandlersSetting, CONTENT_SETTING_DEFAULT, true},
{prefs::kDefaultPpapiBrokerSetting, CONTENT_SETTING_ASK, false}, {prefs::kDefaultPpapiBrokerSetting, CONTENT_SETTING_ASK, false},
{prefs::kDefaultAutomaticDownloadsSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultAutomaticDownloadsSetting, CONTENT_SETTING_ASK, true},
{prefs::kDefaultMidiSysexSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultMidiSysexSetting, CONTENT_SETTING_ASK, true},
{prefs::kDefaultPushMessagingSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultPushMessagingSetting, CONTENT_SETTING_ASK, true},
{prefs::kDefaultSSLCertDecisionsSetting, CONTENT_SETTING_ALLOW, false}, {prefs::kDefaultSSLCertDecisionsSetting, CONTENT_SETTING_ALLOW, false},
#if defined(OS_WIN) #if defined(OS_WIN)
{prefs::kDefaultMetroSwitchToDesktopSetting, CONTENT_SETTING_ASK, true}, {prefs::kDefaultMetroSwitchToDesktopSetting, CONTENT_SETTING_ASK, true},
#elif defined(OS_ANDROID) || defined(OS_CHROMEOS) #elif defined(OS_ANDROID) || defined(OS_CHROMEOS)
{prefs::kDefaultProtectedMediaIdentifierSetting, CONTENT_SETTING_ASK, {prefs::kDefaultProtectedMediaIdentifierSetting, CONTENT_SETTING_ASK, false},
false},
#endif #endif
{prefs::kDefaultAppBannerSetting, CONTENT_SETTING_DEFAULT, false} {prefs::kDefaultAppBannerSetting, CONTENT_SETTING_DEFAULT, false}
}; };
static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
"kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES " "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES "
...@@ -118,7 +118,7 @@ void DefaultProvider::RegisterProfilePrefs( ...@@ -118,7 +118,7 @@ void DefaultProvider::RegisterProfilePrefs(
// Register individual default setting preferences. // Register individual default setting preferences.
// TODO(msramek): The aggregate preference above is deprecated. Remove it // TODO(msramek): The aggregate preference above is deprecated. Remove it
// after two stable releases. // after two stable releases.
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
registry->RegisterIntegerPref( registry->RegisterIntegerPref(
kDefaultSettings[i].pref_name, kDefaultSettings[i].pref_name,
kDefaultSettings[i].default_value, kDefaultSettings[i].default_value,
...@@ -220,7 +220,7 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito) ...@@ -220,7 +220,7 @@ DefaultProvider::DefaultProvider(PrefService* prefs, bool incognito)
&DefaultProvider::OnPreferenceChanged, base::Unretained(this)); &DefaultProvider::OnPreferenceChanged, base::Unretained(this));
pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback); pref_change_registrar_.Add(prefs::kDefaultContentSettings, callback);
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i)
pref_change_registrar_.Add(kDefaultSettings[i].pref_name, callback); pref_change_registrar_.Add(kDefaultSettings[i].pref_name, callback);
} }
...@@ -305,7 +305,7 @@ void DefaultProvider::ShutdownOnUIThread() { ...@@ -305,7 +305,7 @@ void DefaultProvider::ShutdownOnUIThread() {
void DefaultProvider::ReadDefaultSettings() { void DefaultProvider::ReadDefaultSettings() {
base::AutoLock lock(lock_); base::AutoLock lock(lock_);
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
ContentSettingsType content_type = ContentSettingsType(i); ContentSettingsType content_type = ContentSettingsType(i);
ChangeSetting(content_type, ReadIndividualPref(content_type).get()); ChangeSetting(content_type, ReadIndividualPref(content_type).get());
} }
...@@ -313,7 +313,7 @@ void DefaultProvider::ReadDefaultSettings() { ...@@ -313,7 +313,7 @@ void DefaultProvider::ReadDefaultSettings() {
bool DefaultProvider::IsValueEmptyOrDefault(ContentSettingsType content_type, bool DefaultProvider::IsValueEmptyOrDefault(ContentSettingsType content_type,
base::Value* value) { base::Value* value) {
return (value == NULL || return (!value ||
ValueToContentSetting(value) ValueToContentSetting(value)
== kDefaultSettings[content_type].default_value); == kDefaultSettings[content_type].default_value);
} }
...@@ -321,11 +321,8 @@ bool DefaultProvider::IsValueEmptyOrDefault(ContentSettingsType content_type, ...@@ -321,11 +321,8 @@ bool DefaultProvider::IsValueEmptyOrDefault(ContentSettingsType content_type,
void DefaultProvider::ChangeSetting(ContentSettingsType content_type, void DefaultProvider::ChangeSetting(ContentSettingsType content_type,
base::Value* value) { base::Value* value) {
if (!value) { if (!value) {
default_settings_[content_type].reset( default_settings_[content_type].reset(ContentSettingToValue(
kDefaultSettings[content_type].default_value != CONTENT_SETTING_DEFAULT kDefaultSettings[content_type].default_value).release());
? new base::FundamentalValue(
kDefaultSettings[content_type].default_value)
: NULL);
} else { } else {
default_settings_[content_type].reset(value->DeepCopy()); default_settings_[content_type].reset(value->DeepCopy());
} }
...@@ -385,21 +382,20 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) { ...@@ -385,21 +382,20 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) {
scoped_ptr<ValueMap> dictionary = ReadDictionaryPref(); scoped_ptr<ValueMap> dictionary = ReadDictionaryPref();
for (ValueMap::iterator it = dictionary->begin(); for (const auto& it : *dictionary) {
it != dictionary->end(); ++it) { if (!kDefaultSettings[it.first].syncable)
if (!kDefaultSettings[it->first].syncable)
continue; continue;
DCHECK(default_settings_.find(it->first) != default_settings_.end()); DCHECK(default_settings_.find(it.first) != default_settings_.end());
ChangeSetting(it->first, it->second.get()); ChangeSetting(it.first, it.second.get());
WriteIndividualPref(it->first, it->second.get()); WriteIndividualPref(it.first, it.second.get());
to_notify.push_back(it->first); to_notify.push_back(it.first);
} }
} else { } else {
// Find out which content setting the preference corresponds to. // Find out which content setting the preference corresponds to.
ContentSettingsType content_type = CONTENT_SETTINGS_TYPE_DEFAULT; ContentSettingsType content_type = CONTENT_SETTINGS_TYPE_DEFAULT;
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
if (kDefaultSettings[i].pref_name == name) { if (kDefaultSettings[i].pref_name == name) {
content_type = ContentSettingsType(i); content_type = ContentSettingsType(i);
break; break;
...@@ -423,10 +419,10 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) { ...@@ -423,10 +419,10 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) {
to_notify.push_back(content_type); to_notify.push_back(content_type);
} }
for (size_t i = 0; i < to_notify.size(); ++i) { for (const ContentSettingsType content_type : to_notify) {
NotifyObservers(ContentSettingsPattern(), NotifyObservers(ContentSettingsPattern(),
ContentSettingsPattern(), ContentSettingsPattern(),
to_notify[i], content_type,
std::string()); std::string());
} }
} }
...@@ -434,11 +430,7 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) { ...@@ -434,11 +430,7 @@ void DefaultProvider::OnPreferenceChanged(const std::string& name) {
scoped_ptr<base::Value> DefaultProvider::ReadIndividualPref( scoped_ptr<base::Value> DefaultProvider::ReadIndividualPref(
ContentSettingsType content_type) { ContentSettingsType content_type) {
int int_value = prefs_->GetInteger(kDefaultSettings[content_type].pref_name); int int_value = prefs_->GetInteger(kDefaultSettings[content_type].pref_name);
return ContentSettingToValue(IntToContentSetting(int_value)).Pass();
if (int_value == CONTENT_SETTING_DEFAULT)
return make_scoped_ptr((base::Value*)NULL);
else
return make_scoped_ptr(new base::FundamentalValue(int_value));
} }
scoped_ptr<DefaultProvider::ValueMap> DefaultProvider::ReadDictionaryPref() { scoped_ptr<DefaultProvider::ValueMap> DefaultProvider::ReadDictionaryPref() {
...@@ -472,10 +464,9 @@ scoped_ptr<DefaultProvider::ValueMap> DefaultProvider::ReadDictionaryPref() { ...@@ -472,10 +464,9 @@ scoped_ptr<DefaultProvider::ValueMap> DefaultProvider::ReadDictionaryPref() {
void DefaultProvider::ForceDefaultsToBeExplicit(ValueMap* value_map) { void DefaultProvider::ForceDefaultsToBeExplicit(ValueMap* value_map) {
for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
ContentSettingsType type = ContentSettingsType(i); ContentSettingsType type = ContentSettingsType(i);
if (!(*value_map)[type].get() && if (!(*value_map)[type].get()) {
kDefaultSettings[i].default_value != CONTENT_SETTING_DEFAULT) { (*value_map)[type].reset(ContentSettingToValue(
(*value_map)[type].reset( kDefaultSettings[i].default_value).release());
new base::FundamentalValue(kDefaultSettings[i].default_value));
} }
} }
} }
...@@ -483,26 +474,26 @@ void DefaultProvider::ForceDefaultsToBeExplicit(ValueMap* value_map) { ...@@ -483,26 +474,26 @@ void DefaultProvider::ForceDefaultsToBeExplicit(ValueMap* value_map) {
scoped_ptr<DefaultProvider::ValueMap> scoped_ptr<DefaultProvider::ValueMap>
DefaultProvider::GetSettingsFromDictionary( DefaultProvider::GetSettingsFromDictionary(
const base::DictionaryValue* dictionary) { const base::DictionaryValue* dictionary) {
scoped_ptr<ValueMap> value_map(new ValueMap());
if (!dictionary) if (!dictionary)
return make_scoped_ptr(new ValueMap()); return value_map.Pass();
ValueMap* value_map = new ValueMap();
for (base::DictionaryValue::Iterator i(*dictionary); for (base::DictionaryValue::Iterator i(*dictionary);
!i.IsAtEnd(); i.Advance()) { !i.IsAtEnd(); i.Advance()) {
const std::string& content_type(i.key()); const std::string& content_type(i.key());
for (size_t type = 0; type < CONTENT_SETTINGS_NUM_TYPES; ++type) { for (int type = 0; type < CONTENT_SETTINGS_NUM_TYPES; ++type) {
if (content_type == GetTypeName(ContentSettingsType(type))) { if (content_type == GetTypeName(ContentSettingsType(type))) {
int int_value = CONTENT_SETTING_DEFAULT; int int_value = CONTENT_SETTING_DEFAULT;
bool is_integer = i.value().GetAsInteger(&int_value); bool is_integer = i.value().GetAsInteger(&int_value);
DCHECK(is_integer); DCHECK(is_integer);
(*value_map)[ContentSettingsType(type)].reset( (*value_map)[ContentSettingsType(type)].reset(
new base::FundamentalValue(int_value)); ContentSettingToValue(IntToContentSetting(int_value)).release());
break; break;
} }
} }
} }
return make_scoped_ptr(value_map); return value_map.Pass();
} }
void DefaultProvider::MigrateDefaultSettings() { void DefaultProvider::MigrateDefaultSettings() {
...@@ -512,7 +503,7 @@ void DefaultProvider::MigrateDefaultSettings() { ...@@ -512,7 +503,7 @@ void DefaultProvider::MigrateDefaultSettings() {
scoped_ptr<DefaultProvider::ValueMap> value_map = ReadDictionaryPref(); scoped_ptr<DefaultProvider::ValueMap> value_map = ReadDictionaryPref();
for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) { for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
ContentSettingsType content_type = ContentSettingsType(i); ContentSettingsType content_type = ContentSettingsType(i);
WriteIndividualPref(content_type, (*value_map)[content_type].get()); WriteIndividualPref(content_type, (*value_map)[content_type].get());
} }
......
components/content_settings/core/browser/content_settings_utils.cc
View file @ df9d9475
...@@ -169,6 +169,14 @@ bool ParseContentSettingValue(const base::Value* value, ...@@ -169,6 +169,14 @@ bool ParseContentSettingValue(const base::Value* value,
return *setting != CONTENT_SETTING_DEFAULT; return *setting != CONTENT_SETTING_DEFAULT;
} }
scoped_ptr<base::Value> ContentSettingToValue(ContentSetting setting) {
if (setting <= CONTENT_SETTING_DEFAULT ||
setting >= CONTENT_SETTING_NUM_SETTINGS) {
return nullptr;
}
return make_scoped_ptr(new base::FundamentalValue(setting));
}
base::Value* GetContentSettingValueAndPatterns( base::Value* GetContentSettingValueAndPatterns(
const ProviderInterface* provider, const ProviderInterface* provider,
const GURL& primary_url, const GURL& primary_url,
......
components/content_settings/core/browser/content_settings_utils.h
View file @ df9d9475
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include <utility> #include <utility>
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings.h"
#include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/content_settings_pattern.h"
#include "components/content_settings/core/common/content_settings_types.h" #include "components/content_settings/core/common/content_settings_types.h"
...@@ -59,6 +60,10 @@ base::Value* GetContentSettingValueAndPatterns( ...@@ -59,6 +60,10 @@ base::Value* GetContentSettingValueAndPatterns(
ContentSettingsPattern* primary_pattern, ContentSettingsPattern* primary_pattern,
ContentSettingsPattern* secondary_pattern); ContentSettingsPattern* secondary_pattern);
// Returns a |base::Value*| representation of |setting| if |setting| is
// a valid content setting. Otherwise, returns a nullptr.
scoped_ptr<base::Value> ContentSettingToValue(ContentSetting setting);
base::Value* GetContentSettingValueAndPatterns( base::Value* GetContentSettingValueAndPatterns(
const ProviderInterface* provider, const ProviderInterface* provider,
const GURL& primary_url, const GURL& primary_url,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment