chrome/browser/extensions/extension_content_settings_api_constants.cc - 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_api_constants.cc

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.h ('k') | chrome/browser/extensions/extension_content_settings_store.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_content_settings_api_constants.cc

diff --git a/chrome/browser/extensions/extension_content_settings_api_constants.cc b/chrome/browser/extensions/extension_content_settings_api_constants.cc

index 3e7c6388cc5f3528e1d7b35b0694883644396946..c01b3c9006f29dd49b683aac2f50195644be10ec 100644

--- a/chrome/browser/extensions/extension_content_settings_api_constants.cc

+++ b/chrome/browser/extensions/extension_content_settings_api_constants.cc

@@ -10,14 +10,14 @@ namespace extension_content_settings_api_constants {

const char kContentSettingKey[] = "setting";

const char kContentSettingsTypeKey[] = "type";

const char kDescriptionKey[] = "description";

-const char kEmbeddedPatternKey[] = "embeddedPattern";

-const char kEmbeddedUrlKey[] = "embeddedUrl";

const char kIdKey[] = "id";

const char kPatternKey[] = "pattern";

+const char kPrimaryPatternKey[] = "primaryPattern";

+const char kPrimaryUrlKey[] = "primaryUrl";

const char kResourceIdentifierKey[] = "resourceIdentifier";

const char kRuleKey[] = "rule";

-const char kTopLevelPatternKey[] = "topLevelPattern";

-const char kTopLevelUrlKey[] = "topLevelUrl";

+const char kSecondaryPatternKey[] = "secondaryPattern";

+const char kSecondaryUrlKey[] = "secondaryUrl";

// Errors.

const char kIncognitoContextError[] =