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

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

Issue 291603002: Don't try to reload blacklisted extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: expect_eq Created 6 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:
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 5463968d73ac7c4bfa1f3389b1db804bd027f7b5..cc5815b6e65e6e409a35fd059958ce2e90771d90 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -595,7 +595,7 @@ bool ExtensionService::UpdateExtension(const std::string& id,
return true;
}
-void ExtensionService::ReloadExtension(const std::string extension_id) {
+void ExtensionService::ReloadExtension(const std::string& extension_id) {
CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
// If the extension is already reloading, don't reload again.
@@ -604,6 +604,13 @@ void ExtensionService::ReloadExtension(const std::string extension_id) {
return;
}
+ // Ignore attempts to reload a blacklisted extension. Sometimes this can
+ // happen in a convoluted reload sequence triggered by the termination of a
+ // blacklisted extension and a naive attempt to reload it. For an example see
+ // http://crbug.com/373842.
+ if (registry_->blacklisted_extensions().Contains(extension_id))
+ return;
+
base::FilePath path;
const Extension* current_extension = GetExtensionById(extension_id, false);

Powered by Google App Engine
This is Rietveld 408576698