chrome/browser/extensions/api/content_settings/content_settings_store.cc - Issue 440423003: Clean content_settings_pattern_parser.* from unnecessary dependencies.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Removed the clients 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

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc » ('j') | chrome/common/content_settings_pattern.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..fa13b68555dfd1b2ca935c29b66757cfdd60cf53 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

@@ -19,6 +19,7 @@

#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

#include "content/public/browser/browser_thread.h"

+#include "extensions/common/constants.h"

using content::BrowserThread;

using content_settings::ConcatenationIterator;

@@ -261,9 +262,11 @@ base::ListValue* ContentSettingsStore::GetSettingsForExtension(

const Rule& rule = rule_iterator->Next();

base::DictionaryValue* setting_dict = new base::DictionaryValue();

setting_dict->SetString(keys::kPrimaryPatternKey,

- rule.primary_pattern.ToString());

+ rule.primary_pattern.ToString(

+ extensions::kExtensionScheme));

setting_dict->SetString(keys::kSecondaryPatternKey,

- rule.secondary_pattern.ToString());

+ rule.secondary_pattern.ToString(

+ extensions::kExtensionScheme));

setting_dict->SetString(

keys::kContentSettingsTypeKey,

helpers::ContentSettingsTypeToString(it->first.content_type));

@@ -294,13 +297,15 @@ void ContentSettingsStore::SetExtensionContentSettingFromList(

std::string primary_pattern_str;

dict->GetString(keys::kPrimaryPatternKey, &primary_pattern_str);

ContentSettingsPattern primary_pattern =

- ContentSettingsPattern::FromString(primary_pattern_str);

+ ContentSettingsPattern::FromString(extensions::kExtensionScheme,

+ 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(extensions::kExtensionScheme,

+ secondary_pattern_str);

DCHECK(secondary_pattern.IsValid());

std::string content_settings_type_str;