GTK: hook up drag and drop of browser actions (for reordering).
The changes are propagated across open chrome windows, but are not persisted between sessions yet.
BUG=26990
Review URL: http://codereview.chromium.org/463056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34272 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 058907e..f8916d7f 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -276,10 +276,9 @@
void ExtensionsService::DisableExtension(const std::string& extension_id) {
Extension* extension = GetExtensionByIdInternal(extension_id, true, false);
- if (!extension) {
- NOTREACHED() << "Trying to disable an extension that isn't enabled.";
+ // The extension may have been disabled already.
+ if (!extension)
return;
- }
// Remember that we disabled it, unless it's temporary.
if (extension->location() != Extension::LOAD)
