chrome/browser/content_settings/content_settings_default_provider.cc - Issue 545413002: Detach the dependency from host_content_settings_map to extension.

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_default_provider.cc

Issue 545413002: Detach the dependency from host_content_settings_map to extension. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove ProviderType Created 6 years, 3 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_default_provider.h ('k') | chrome/browser/content_settings/content_settings_internal_extension_provider.h » ('j') | chrome/browser/content_settings/host_content_settings_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

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

index 641c3b7be21e2b7d1d9b248807d4b9fdf5dc5b2e..9e62322a10b937f8fcc569b004da3dfd766167ad 100644

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

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

@@ -277,6 +277,14 @@ void DefaultProvider::ShutdownOnUIThread() {

prefs_ = NULL;

}

+std::string DefaultProvider::GetProviderName() const {

+ return "default";

+SettingSource DefaultProvider::GetSettingSource() const {

+ return SETTING_SOURCE_USER;

void DefaultProvider::OnPreferenceChanged(const std::string& name) {

DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));

if (updating_preferences_)