chrome/browser/extensions/extension_content_settings_store.h - Issue 7253041: Use primary/secondary for URLs and patterns everywhere in the content settings extension API.

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/extension_content_settings_store.h

Issue 7253041: Use primary/secondary for URLs and patterns everywhere in the content settings extension API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix Created 9 years, 6 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/extensions/extension_content_settings_api_constants.cc ('k') | chrome/browser/extensions/extension_content_settings_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_content_settings_store.h

diff --git a/chrome/browser/extensions/extension_content_settings_store.h b/chrome/browser/extensions/extension_content_settings_store.h

index 67ec02c72617d01bab44e03699733528f15508ab..1f090a68ab29a5efaa4f328a60d40fcc3ec486a0 100644

--- a/chrome/browser/extensions/extension_content_settings_store.h

+++ b/chrome/browser/extensions/extension_content_settings_store.h

@@ -118,14 +118,14 @@ class ExtensionContentSettingsStore {

private:

struct ExtensionEntry;

struct ContentSettingSpec {

- ContentSettingSpec(const ContentSettingsPattern& pattern,

- const ContentSettingsPattern& embedder_pattern,

+ ContentSettingSpec(const ContentSettingsPattern& primary_pattern,

+ const ContentSettingsPattern& secondary_pattern,

ContentSettingsType type,

const content_settings::ResourceIdentifier& identifier,

ContentSetting setting);

- ContentSettingsPattern embedded_pattern;

- ContentSettingsPattern top_level_pattern;

+ ContentSettingsPattern primary_pattern;

+ ContentSettingsPattern secondary_pattern;

ContentSettingsType content_type;

content_settings::ResourceIdentifier resource_identifier;

ContentSetting setting;