Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(723)

Unified Diff: chrome/browser/content_settings/content_settings_default_provider.cc

Issue 8776044: Don't set a default Value for content settigns type AutoSelectCertificate (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_default_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/content_settings/content_settings_default_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc
index f330b70bfb53bc54f605249a9978373e51878b14..c9987a05deb17a1d043bfd31f5f2682d582b930b 100644
--- a/chrome/browser/content_settings/content_settings_default_provider.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider.cc
@@ -55,7 +55,8 @@ namespace {
class DefaultRuleIterator : public RuleIterator {
public:
explicit DefaultRuleIterator(const base::Value* value) {
- value_.reset(value->DeepCopy());
+ if (value)
+ value_.reset(value->DeepCopy());
}
bool HasNext() const {
@@ -316,9 +317,11 @@ void DefaultProvider::ReadDefaultSettings(bool overwrite) {
void DefaultProvider::ForceDefaultsToBeExplicit() {
for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
ContentSettingsType type = ContentSettingsType(i);
- if (!default_settings_[type].get())
+ if (!default_settings_[type].get() &&
+ kDefaultSettings[i] != CONTENT_SETTING_DEFAULT) {
default_settings_[type].reset(
Value::CreateIntegerValue(kDefaultSettings[i]));
+ }
}
}
« no previous file with comments | « no previous file | chrome/browser/content_settings/content_settings_default_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698