Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4861)

Unified Diff: chrome/browser/extensions/extension_service.cc

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional cleanup Created 6 years, 10 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
Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 7724a3582201aa99545620a67e928eaf46dd56c3..5e670e56ce61e4860c8c61ab32830f93a58820e5 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1240,20 +1240,12 @@ content::BrowserContext* ExtensionService::GetBrowserContext() const {
return profile_;
}
-extensions::ExtensionPrefs* ExtensionService::extension_prefs() {
- return extension_prefs_;
-}
-
-const extensions::ExtensionPrefs* ExtensionService::extension_prefs() const {
- return extension_prefs_;
-}
-
extensions::SettingsFrontend* ExtensionService::settings_frontend() {
return settings_frontend_.get();
}
extensions::ContentSettingsStore* ExtensionService::GetContentSettingsStore() {
- return extension_prefs()->content_settings_store();
+ return extension_prefs_->content_settings_store();
}
bool ExtensionService::is_ready() {
@@ -1860,7 +1852,7 @@ void ExtensionService::UpdateActivePermissions(const Extension* extension) {
// custom set of active permissions defined in the extension prefs. Here,
// we update the extension's active permissions based on the prefs.
scoped_refptr<PermissionSet> active_permissions =
- extension_prefs()->GetActivePermissions(extension->id());
+ extension_prefs_->GetActivePermissions(extension->id());
if (active_permissions.get()) {
// We restrict the active permissions to be within the bounds defined in the
@@ -2160,7 +2152,7 @@ void ExtensionService::OnExtensionInstalled(
// load it (see AddExtension). Usually it should be the job of callers to
// incercept blacklisted extension earlier (e.g. CrxInstaller, before even
// showing the install dialogue).
- extension_prefs()->AcknowledgeBlacklistedExtension(id);
+ extension_prefs_->AcknowledgeBlacklistedExtension(id);
UMA_HISTOGRAM_ENUMERATION("ExtensionBlacklist.SilentInstall",
extension->location(),
Manifest::NUM_LOCATIONS);

Powered by Google App Engine
This is Rietveld 408576698