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

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

Issue 9360005: Handle termination/crashes of an extension hosted in the ExtensionDialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 84397982cc4e10874b4d7d1a24dfd29d71d0adef..2f6c3af9c548ef45d82018202c0843a23ac7be10 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -12,6 +12,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/file_util.h"
+#include "base/json/json_value_serializer.h"
Yoyo Zhou 2012/02/10 00:45:28 This looks unused.
Aaron Boodman 2012/02/10 20:35:16 don't forget to remove this
rkc 2012/02/10 20:51:17 Done.
#include "base/logging.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram.h"
@@ -716,6 +717,13 @@ void ExtensionService::ReloadExtension(const std::string& extension_id) {
path = unloaded_extension_paths_[extension_id];
}
+ // If we're reloading a component extension, use the component extension
+ // loader's reloader.
+ if (component_loader_->Exists(extension_id)) {
+ component_loader_->Reload(extension_id);
+ return;
+ }
+
// Check the installed extensions to see if what we're reloading was already
// installed.
scoped_ptr<ExtensionInfo> installed_extension(

Powered by Google App Engine
This is Rietveld 408576698