chrome/browser/extensions/extension_service.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/extensions/extension_service.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/extensions/extension_service.cc

diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc

index 98d581ca18173ea1c22a086f71f77df9fb18dec2..c25e30bf03351c0f39cf3b0c4b74de7d6d77c02f 100644

--- a/chrome/browser/extensions/extension_service.cc

+++ b/chrome/browser/extensions/extension_service.cc

@@ -1225,8 +1225,7 @@ extensions::SettingsFrontend* ExtensionService::settings_frontend() {

return settings_frontend_.get();

}

-ExtensionContentSettingsStore*

- ExtensionService::GetExtensionContentSettingsStore() {

+extensions::ContentSettingsStore* ExtensionService::GetContentSettingsStore() {

return extension_prefs()->content_settings_store();

}

« no previous file with comments | « chrome/browser/extensions/extension_service.h ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »