chrome/browser/extensions/api/content_settings/content_settings_api.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/extensions/api/content_settings/content_settings_api.cc

Issue 220353002: Remove //chrome dependency from ExtensionPrefs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

View side-by-side diff with in-line comments

Download patch

« apps/shell/browser/shell_extensions_browser_client.h ('K') | « chrome/browser/content_settings/host_content_settings_map.cc ('k') | chrome/browser/extensions/api/content_settings/content_settings_service.h » ('j') | chrome/browser/extensions/api/content_settings/content_settings_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/content_settings/content_settings_api.cc

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

index 9dfe012230b01bdc8e93e4c2b11ac57dedbe23c0..6fff07ff0954caebb005ae1e3681c01c542d5b47 100644

--- a/chrome/browser/extensions/api/content_settings/content_settings_api.cc

+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.cc

@@ -15,6 +15,7 @@

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

#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"

#include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"

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

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

#include "chrome/browser/extensions/api/preference/preference_api_constants.h"

#include "chrome/browser/extensions/api/preference/preference_helpers.h"

@@ -24,7 +25,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/api/content_settings.h"

#include "content/public/browser/plugin_service.h"

-#include "extensions/browser/extension_prefs.h"

+#include "extensions/browser/extension_prefs_scope.h"

#include "extensions/common/error_utils.h"

using content::BrowserThread;

@@ -87,7 +88,7 @@ bool ContentSettingsContentSettingClearFunction::RunImpl() {

}

ContentSettingsStore* store =

- ExtensionPrefs::Get(GetProfile())->content_settings_store();

+ ContentSettingsService::Get(GetProfile())->content_settings_store();

store->ClearContentSettingsForExtension(extension_id(), scope);

return true;

@@ -238,7 +239,7 @@ bool ContentSettingsContentSettingSetFunction::RunImpl() {

}

ContentSettingsStore* store =

- ExtensionPrefs::Get(GetProfile())->content_settings_store();

+ ContentSettingsService::Get(GetProfile())->content_settings_store();

store->SetExtensionContentSetting(extension_id(), primary_pattern,

secondary_pattern, content_type,

resource_identifier, setting, scope);