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

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: Navigate to about:crash instead of using base::KillProcess 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 e6ef0a9cddc0b1e63006eccc4aca13ef9819980f..bfe42aebb2960408182bbee525440d1a851ce0f8 100644
--- a/chrome/browser/extensions/api/management/management_api.cc
+++ b/chrome/browser/extensions/api/management/management_api.cc
@@ -447,13 +447,27 @@ 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.
Aaron Boodman 2012/09/04 22:47:19 Does not seem right that this code is before polic
+ if (service()->GetTerminatedExtension(extension_id_)) {
+ if (params->enabled) {
+ service()->ReloadExtension(extension_id_);
Aaron Boodman 2012/09/04 22:47:19 Why this special case? Just make this extension af
mitchellwrosen 2012/09/04 23:00:08 Isn't it a special case, though? Terminated extens
+ } else {
+ // Treat setEnabled(false) when the extension has crashed as a no-op.
+ BrowserThread::PostTask(
+ BrowserThread::UI,
+ FROM_HERE,
+ base::Bind(&SetEnabledFunction::SendResponse, this, true));
+ return true;
+ }
+ }
+
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