chrome/browser/extensions/api/content_settings/content_settings_api.cc - Issue 11365181: Remove GetExtensionService from Profile.

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 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: replace missing extension_system include Created 8 years, 1 month 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/extensions/api/app/app_api.cc ('k') | chrome/browser/extensions/api/extension_action/browser_action_apitest.cc » ('j') | no next file with comments »
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 9357bcc4e4a318c6555722d4d18be47bc1f3f91b..87c179891bd6c91f4e4e90714b0bb972dd6dccab 100644

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

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

@@ -19,6 +19,7 @@

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

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

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

+#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/plugins/plugin_finder.h"

#include "chrome/browser/plugins/plugin_installer.h"

#include "chrome/browser/prefs/pref_service.h"

@@ -88,8 +89,8 @@ bool ClearContentSettingsFunction::RunImpl() {

}

- ContentSettingsStore* store =

- profile_->GetExtensionService()->GetContentSettingsStore();

+ ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->

+ extension_service()->GetContentSettingsStore();

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

return true;

@@ -241,8 +242,8 @@ bool SetContentSettingFunction::RunImpl() {

return false;

}

- ContentSettingsStore* store =

- profile_->GetExtensionService()->GetContentSettingsStore();

+ ContentSettingsStore* store = extensions::ExtensionSystem::Get(profile_)->

+ extension_service()->GetContentSettingsStore();

store->SetExtensionContentSetting(extension_id(), primary_pattern,

secondary_pattern, content_type,

resource_identifier, setting, scope);