| Index: chrome/browser/content_settings/content_settings_custom_extension_provider.cc
|
| diff --git a/chrome/browser/content_settings/content_settings_extension_provider.cc b/chrome/browser/content_settings/content_settings_custom_extension_provider.cc
|
| similarity index 79%
|
| rename from chrome/browser/content_settings/content_settings_extension_provider.cc
|
| rename to chrome/browser/content_settings/content_settings_custom_extension_provider.cc
|
| index 7994f2975d571f445815b75cfe725616584367d1..dfad27019ef943e609ec7a457e7d6cad9f28686e 100644
|
| --- a/chrome/browser/content_settings/content_settings_extension_provider.cc
|
| +++ b/chrome/browser/content_settings/content_settings_custom_extension_provider.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/content_settings/content_settings_extension_provider.h"
|
| +#include "chrome/browser/content_settings/content_settings_custom_extension_provider.h"
|
|
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/content_settings/content_settings_utils.h"
|
| @@ -11,7 +11,7 @@
|
|
|
| namespace content_settings {
|
|
|
| -ExtensionProvider::ExtensionProvider(
|
| +CustomExtensionProvider::CustomExtensionProvider(
|
| extensions::ContentSettingsStore* extensions_settings,
|
| bool incognito)
|
| : incognito_(incognito),
|
| @@ -19,10 +19,10 @@ ExtensionProvider::ExtensionProvider(
|
| extensions_settings_->AddObserver(this);
|
| }
|
|
|
| -ExtensionProvider::~ExtensionProvider() {
|
| +CustomExtensionProvider::~CustomExtensionProvider() {
|
| }
|
|
|
| -RuleIterator* ExtensionProvider::GetRuleIterator(
|
| +RuleIterator* CustomExtensionProvider::GetRuleIterator(
|
| ContentSettingsType content_type,
|
| const ResourceIdentifier& resource_identifier,
|
| bool incognito) const {
|
| @@ -31,7 +31,7 @@ RuleIterator* ExtensionProvider::GetRuleIterator(
|
| incognito);
|
| }
|
|
|
| -bool ExtensionProvider::SetWebsiteSetting(
|
| +bool CustomExtensionProvider::SetWebsiteSetting(
|
| const ContentSettingsPattern& primary_pattern,
|
| const ContentSettingsPattern& secondary_pattern,
|
| ContentSettingsType content_type,
|
| @@ -40,12 +40,12 @@ bool ExtensionProvider::SetWebsiteSetting(
|
| return false;
|
| }
|
|
|
| -void ExtensionProvider::ShutdownOnUIThread() {
|
| +void CustomExtensionProvider::ShutdownOnUIThread() {
|
| RemoveAllObservers();
|
| extensions_settings_->RemoveObserver(this);
|
| }
|
|
|
| -void ExtensionProvider::OnContentSettingChanged(
|
| +void CustomExtensionProvider::OnContentSettingChanged(
|
| const std::string& extension_id,
|
| bool incognito) {
|
| if (incognito_ != incognito)
|
|
|