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

Index: chrome/browser/content_settings/content_settings_extension_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_extension_provider.cc b/chrome/browser/content_settings/content_settings_extension_provider.cc

index 610f3038c91f8421d1bea28676d7585e585031ea..7994f2975d571f445815b75cfe725616584367d1 100644

--- a/chrome/browser/content_settings/content_settings_extension_provider.cc

+++ b/chrome/browser/content_settings/content_settings_extension_provider.cc

@@ -6,13 +6,13 @@

#include "base/memory/scoped_ptr.h"

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

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

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

#include "chrome/common/content_settings_pattern.h"

namespace content_settings {

ExtensionProvider::ExtensionProvider(

- ExtensionContentSettingsStore* extensions_settings,

+ extensions::ContentSettingsStore* extensions_settings,

bool incognito)

: incognito_(incognito),

extensions_settings_(extensions_settings) {