chrome/browser/extensions/api/content_settings/content_settings_store.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_store.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: Moved to c/b/e/api/content_settings 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:

Index: chrome/browser/extensions/api/content_settings/content_settings_store.cc

diff --git a/chrome/browser/extensions/extension_content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc

similarity index 97%

rename from chrome/browser/extensions/extension_content_settings_store.cc

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

index 14713a1cdc41c1d84121635426f1843bc97ffb65..7b3096ab361db45b78976becce213221fef3c006 100644

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

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

@@ -2,7 +2,7 @@

// 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_store.h"

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

#include <set>

@@ -14,12 +14,12 @@

#include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"

#include "chrome/browser/content_settings/content_settings_rule.h"

#include "chrome/browser/content_settings/content_settings_utils.h"

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

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

+#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"

-namespace helpers = extension_content_settings_helpers;

-namespace keys = extension_content_settings_api_constants;

+namespace helpers = content_settings_helpers;

+namespace keys = content_settings_api_constants;

using content::BrowserThread;

using content_settings::ConcatenationIterator;