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

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

Issue 156843004: Remove ExtensionService::extension_prefs() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix UserScriptListenerTests.MultiProfile 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
« no previous file with comments | « chrome/browser/extensions/install_tracker_factory.cc ('k') | chrome/browser/extensions/launch_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/installed_loader.cc
diff --git a/chrome/browser/extensions/installed_loader.cc b/chrome/browser/extensions/installed_loader.cc
index 141586cc343261f3a1272cef3469edefecfebcf5..36d8ada899b42c59813d4225a23409186344bc00 100644
--- a/chrome/browser/extensions/installed_loader.cc
+++ b/chrome/browser/extensions/installed_loader.cc
@@ -119,7 +119,7 @@ BackgroundPageType GetBackgroundPageType(const Extension* extension) {
InstalledLoader::InstalledLoader(ExtensionService* extension_service)
: extension_service_(extension_service),
extension_registry_(ExtensionRegistry::Get(extension_service->profile())),
- extension_prefs_(extension_service->extension_prefs()) {}
+ extension_prefs_(ExtensionPrefs::Get(extension_service->profile())) {}
InstalledLoader::~InstalledLoader() {
}
@@ -412,8 +412,7 @@ void InstalledLoader::LoadAllExtensions() {
extension_registry_->disabled_extensions();
for (ex = disabled_extensions.begin(); ex != disabled_extensions.end();
++ex) {
- if (extension_service_->extension_prefs()->
- DidExtensionEscalatePermissions((*ex)->id())) {
+ if (extension_prefs_->DidExtensionEscalatePermissions((*ex)->id())) {
++disabled_for_permissions_count;
}
if (Manifest::IsExternalLocation((*ex)->location())) {
« no previous file with comments | « chrome/browser/extensions/install_tracker_factory.cc ('k') | chrome/browser/extensions/launch_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698