Index: chrome/browser/extensions/extension_service.cc |
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc |
index a61fec9cf634dfc42faac3cf9c0ff37373e012a7..12944a4ccd7b0a5a911d9d1f422810724971a493 100644 |
--- a/chrome/browser/extensions/extension_service.cc |
+++ b/chrome/browser/extensions/extension_service.cc |
@@ -358,7 +358,7 @@ ExtensionService::ExtensionService(Profile* profile, |
blacklist_(blacklist), |
extension_sync_service_(NULL), |
registry_(extensions::ExtensionRegistry::Get(profile)), |
- pending_extension_manager_(*this), |
+ pending_extension_manager_(*this, profile), |
install_directory_(install_directory), |
extensions_enabled_(extensions_enabled), |
show_extensions_prompts_(true), |
@@ -955,11 +955,6 @@ bool ExtensionService::IsExtensionEnabled( |
!extension_prefs_->IsExternalExtensionUninstalled(extension_id); |
} |
-bool ExtensionService::IsExternalExtensionUninstalled( |
- const std::string& extension_id) const { |
- return extension_prefs_->IsExternalExtensionUninstalled(extension_id); |
-} |
- |
void ExtensionService::EnableExtension(const std::string& extension_id) { |
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
@@ -2138,7 +2133,7 @@ void ExtensionService::OnExtensionInstalled( |
// We explicitly want to re-enable an uninstalled external |
// extension; if we're here, that means the user is manually |
// installing the extension. |
- if (IsExternalExtensionUninstalled(id)) { |
+ if (extension_prefs_->IsExternalExtensionUninstalled(id)) { |
initial_enable = true; |
} |
} |