Remove ExtensionService::extension_prefs()
Callers use ExtensionPrefs::Get instead of depending on
ExtensionService for access. Where appropriate, other
nearby, unnecessary references to ExtensionService have
also been removed.
BUG=341181
[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected],[email protected]
Review URL: https://codereview.chromium.org/156843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251958 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index 06ab993..56388a1 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -1262,20 +1262,12 @@
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() {
@@ -1882,7 +1874,7 @@
// 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
@@ -2182,7 +2174,7 @@
// 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);
