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

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_store.cc

Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months 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
Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc
index 12f9a270e504fd8a25b945ccc169a4b3d9739422..4ec95636f8515740a2b922f070e8f1707963e693 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc
@@ -18,6 +18,7 @@
#include "chrome/browser/content_settings/content_settings_utils.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
+#include "chrome/common/chrome_content_settings_client.h"
#include "content/public/browser/browser_thread.h"
using content::BrowserThread;
@@ -260,10 +261,11 @@ base::ListValue* ContentSettingsStore::GetSettingsForExtension(
while (rule_iterator->HasNext()) {
const Rule& rule = rule_iterator->Next();
base::DictionaryValue* setting_dict = new base::DictionaryValue();
+ content_settings::ChromeContentSettingsClient client;
setting_dict->SetString(keys::kPrimaryPatternKey,
- rule.primary_pattern.ToString());
+ rule.primary_pattern.ToString(&client));
setting_dict->SetString(keys::kSecondaryPatternKey,
- rule.secondary_pattern.ToString());
+ rule.secondary_pattern.ToString(&client));
setting_dict->SetString(
keys::kContentSettingsTypeKey,
helpers::ContentSettingsTypeToString(it->first.content_type));
@@ -293,14 +295,15 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(
base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(*it);
std::string primary_pattern_str;
dict->GetString(keys::kPrimaryPatternKey, &primary_pattern_str);
+ content_settings::ChromeContentSettingsClient client;
ContentSettingsPattern primary_pattern =
- ContentSettingsPattern::FromString(primary_pattern_str);
+ ContentSettingsPattern::FromString(&client, primary_pattern_str);
DCHECK(primary_pattern.IsValid());
std::string secondary_pattern_str;
dict->GetString(keys::kSecondaryPatternKey, &secondary_pattern_str);
ContentSettingsPattern secondary_pattern =
- ContentSettingsPattern::FromString(secondary_pattern_str);
+ ContentSettingsPattern::FromString(&client, secondary_pattern_str);
DCHECK(secondary_pattern.IsValid());
std::string content_settings_type_str;

Powered by Google App Engine
This is Rietveld 408576698