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

Index: chrome/browser/content_settings/host_content_settings_map.cc

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

index eb9017be144161689b9f6a4b5500374ab9874cb4..c9da6a390f8ea67b77ffe35304b6e3f7c5225691 100644

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

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

@@ -103,7 +103,7 @@ HostContentSettingsMap::HostContentSettingsMap(

// |extension_service| can be NULL in unit tests.

content_settings::ObservableProvider* extension_provider =

new content_settings::ExtensionProvider(

- extension_service->GetExtensionContentSettingsStore(),

+ extension_service->GetContentSettingsStore(),

is_off_the_record_);

extension_provider->AddObserver(this);

content_settings_providers_[EXTENSION_PROVIDER] = extension_provider;