chrome/browser/content_settings/extension_content_settings_api.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/content_settings/extension_content_settings_api.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: 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/content_settings/extension_content_settings_api.cc

diff --git a/chrome/browser/extensions/extension_content_settings_api.cc b/chrome/browser/content_settings/extension_content_settings_api.cc

similarity index 97%

rename from chrome/browser/extensions/extension_content_settings_api.cc

rename to chrome/browser/content_settings/extension_content_settings_api.cc

index d08b250109c690da15a292f31404a953a0a1acab..c965c3c16afbbcd06bb21116d2b3c7ce4125ebd9 100644

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

+++ b/chrome/browser/content_settings/extension_content_settings_api.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_api.h"

+#include "chrome/browser/content_settings/extension_content_settings_api.h"

#include <vector>

@@ -10,10 +10,10 @@

#include "base/command_line.h"

#include "base/values.h"

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

+#include "chrome/browser/content_settings/extension_content_settings_api_constants.h"

+#include "chrome/browser/content_settings/extension_content_settings_helpers.h"

+#include "chrome/browser/content_settings/extension_content_settings_store.h"

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

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

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

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

#include "chrome/browser/extensions/extension_preference_api_constants.h"

#include "chrome/browser/extensions/extension_preference_helpers.h"

#include "chrome/browser/extensions/extension_service.h"