| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/content_settings/core/browser/content_settings_default_prov
ider.h" | 5 #include "components/content_settings/core/browser/content_settings_default_prov
ider.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 content_type, | 253 content_type, |
| 254 ResourceIdentifier()); | 254 ResourceIdentifier()); |
| 255 | 255 |
| 256 return true; | 256 return true; |
| 257 } | 257 } |
| 258 | 258 |
| 259 RuleIterator* DefaultProvider::GetRuleIterator( | 259 RuleIterator* DefaultProvider::GetRuleIterator( |
| 260 ContentSettingsType content_type, | 260 ContentSettingsType content_type, |
| 261 const ResourceIdentifier& resource_identifier, | 261 const ResourceIdentifier& resource_identifier, |
| 262 bool incognito) const { | 262 bool incognito) const { |
| 263 // The default provider never has incognito-specific settings. |
| 264 if (incognito) |
| 265 return new EmptyRuleIterator(); |
| 266 |
| 263 base::AutoLock lock(lock_); | 267 base::AutoLock lock(lock_); |
| 264 if (resource_identifier.empty()) { | 268 if (resource_identifier.empty()) { |
| 265 auto it(default_settings_.find(content_type)); | 269 auto it(default_settings_.find(content_type)); |
| 266 if (it != default_settings_.end()) | 270 if (it != default_settings_.end()) |
| 267 return new DefaultRuleIterator(it->second); | 271 return new DefaultRuleIterator(it->second); |
| 268 NOTREACHED(); | 272 NOTREACHED(); |
| 269 } | 273 } |
| 270 return new EmptyRuleIterator(); | 274 return new EmptyRuleIterator(); |
| 271 } | 275 } |
| 272 | 276 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 } | 376 } |
| 373 | 377 |
| 374 void DefaultProvider::DiscardObsoletePreferences() { | 378 void DefaultProvider::DiscardObsoletePreferences() { |
| 375 prefs_->ClearPref(kObsoleteDefaultContentSettings); | 379 prefs_->ClearPref(kObsoleteDefaultContentSettings); |
| 376 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings); | 380 prefs_->ClearPref(kObsoleteMigratedDefaultContentSettings); |
| 377 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting); | 381 prefs_->ClearPref(kObsoleteMigratedDefaultMediaStreamSetting); |
| 378 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting); | 382 prefs_->ClearPref(kObsoleteMetroSwitchToDesktopSetting); |
| 379 } | 383 } |
| 380 | 384 |
| 381 } // namespace content_settings | 385 } // namespace content_settings |
| OLD | NEW |