chrome/browser/content_settings/host_content_settings_map.cc - Issue 220353002: Remove //chrome dependency from ExtensionPrefs

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 220353002: Remove //chrome dependency from ExtensionPrefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't ref ContentSettingsStore if !ENABLE_EXTENSIONS Created 6 years, 9 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 ce7815f38f02084f5e05f6d1c15d17b3cdfcdf69..27d656dab9d2f395b75fba9ca04d0e4a4c4fbde8 100644

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

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

@@ -23,6 +23,7 @@

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

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

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

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

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

#include "chrome/common/chrome_switches.h"

#include "chrome/common/content_settings_pattern.h"

@@ -120,7 +121,7 @@ void HostContentSettingsMap::RegisterExtensionService(

content_settings::ObservableProvider* custom_extension_provider =

new content_settings::CustomExtensionProvider(

- extensions::ExtensionPrefs::Get(

+ extensions::ContentSettingsService::Get(

extension_service->GetBrowserContext())->content_settings_store(),

is_off_the_record_);

custom_extension_provider->AddObserver(this);