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

Unified Diff: chrome/browser/extensions/api/management/management_api.cc

Issue 10832237: Allow chrome.management.setEnabled() to re-enable crashed extensions. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixes Created 8 years, 4 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 | « no previous file | chrome/browser/extensions/api/management/management_api_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/management/management_api.cc
diff --git a/chrome/browser/extensions/api/management/management_api.cc b/chrome/browser/extensions/api/management/management_api.cc
index 07c3455d542ce56fda1635274e06d7b5cca375d4..909b943b797d128a7018aebfd7a575e26739b8f3 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -433,13 +433,17 @@ bool SetEnabledFunction::RunImpl() {
extension_id_ = params->id;
- const Extension* extension = service()->GetExtensionById(extension_id_, true);
+ const Extension* extension = service()->GetInstalledExtension(extension_id_);
if (!extension) {
error_ = ExtensionErrorUtils::FormatErrorMessage(
keys::kNoExtensionError, extension_id_);
return false;
}
+ // The extension may have been unloaded due to a crash.
+ if (service()->GetTerminatedExtension(extension_id_))
+ service()->ReloadExtension(extension_id_);
asargent_no_longer_on_chrome 2012/08/13 19:10:34 nit: I think we should only call ReloadExtension i
+
const extensions::ManagementPolicy* policy = extensions::ExtensionSystem::Get(
profile())->management_policy();
if (!policy->UserMayModifySettings(extension, NULL)) {
« no previous file with comments | « no previous file | chrome/browser/extensions/api/management/management_api_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698