chrome/browser/extensions/api/content_settings/content_settings_api_constants.h - Issue 10381097: Move content settings extension API to content_settings dir.

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_api_constants.h

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fixed conflict Created 8 years, 7 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/api/content_settings/content_settings_api.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_api_constants.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api_constants.h

diff --git a/chrome/browser/extensions/extension_content_settings_api_constants.h b/chrome/browser/extensions/api/content_settings/content_settings_api_constants.h

similarity index 68%

rename from chrome/browser/extensions/extension_content_settings_api_constants.h

rename to chrome/browser/extensions/api/content_settings/content_settings_api_constants.h

index 4ada1464cd2125db11a8634a53b31360e888aeaa..e81dda63752d0d915960c0c7155ab2abfb908287 100644

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

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api_constants.h

@@ -4,11 +4,12 @@

// Constants used for the Content Settings API.

-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_CONSTANTS_H__

-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_CONSTANTS_H__

+#ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_CONSTANTS_H__

+#define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_CONSTANTS_H__

#pragma once

-namespace extension_content_settings_api_constants {

+namespace extensions {

+namespace content_settings_api_constants {

// Keys.

extern const char kContentSettingKey[];

@@ -29,5 +30,6 @@ extern const char kIncognitoSessionOnlyError[];

extern const char kInvalidUrlError[];

}

+} // namespace extensions

-#endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_CONSTANTS_H__

+#endif // CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_CONSTANTS_H__