diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:10:15 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-10 20:10:15 +0000 |
| commit | b2ba996f96dfd3bde403fce818258d97e3ca8002 (patch) | |
| tree | 36f4f264fc2c8af5e6695ef31ac78afb7ebdc5c2 /chrome/browser/extensions/extensions_service.cc | |
| parent | 92b24c11f42b31158cca43921eac16f33c98839c (diff) | |
| download | chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.zip chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.tar.gz chromium_src-b2ba996f96dfd3bde403fce818258d97e3ca8002.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/extensions/extensions_service.cc')
| -rw-r--r-- | chrome/browser/extensions/extensions_service.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index 058907e..f8916d7 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -276,10 +276,9 @@ void ExtensionsService::EnableExtension(const std::string& extension_id) { 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) |