chrome/browser/extensions/api/content_settings/content_settings_api_constants.cc - 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.cc

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_constants.h ('k') | chrome/browser/extensions/api/content_settings/content_settings_apitest.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.cc

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

similarity index 81%

rename from chrome/browser/extensions/extension_content_settings_api_constants.cc

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

index c01b3c9006f29dd49b683aac2f50195644be10ec..a2b794bfd958b40a870d7e4a2f8d8e185c93a1d9 100644

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

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

@@ -2,9 +2,10 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "chrome/browser/extensions/extension_content_settings_api_constants.h"

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

-namespace extension_content_settings_api_constants {

+namespace extensions {

+namespace content_settings_api_constants {

// Keys.

const char kContentSettingKey[] = "setting";

@@ -27,4 +28,5 @@ const char kIncognitoSessionOnlyError[] =

"is open.";

const char kInvalidUrlError[] = "The URL \"*\" is invalid.";

-} // extension_content_settings_api_constants

+} // namespace content_settings_api_constants

+} // namespace extensions