Revert 13676 - Revert 131665 - Add a preference for why an extension is disabled.

chrome/browser/extensions/extension_disabled_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/extension_disabled_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
@@ skipping 170 matching lines @@
       extension_(extension),
       user_response_(IGNORED),
       menu_command_id_(GetMenuCommandID()) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(service->profile()));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(service->profile()));
 }
 
 ExtensionDisabledGlobalError::~ExtensionDisabledGlobalError() {
+  ReleaseMenuCommandID(menu_command_id_);
   HISTOGRAM_ENUMERATION("Extensions.DisabledUIUserResponse",
                         user_response_, EXTENSION_DISABLED_UI_BUCKET_BOUNDARY);
 }
 
 bool ExtensionDisabledGlobalError::HasBadge() {
   return true;
 }
 
 bool ExtensionDisabledGlobalError::HasMenuItem() {
   return true;
@@ skipping 75 matching lines @@
     extension = content::Details<const Extension>(details).ptr();
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_EXTENSION_UNLOADED, type);
     UnloadedExtensionInfo* info =
         content::Details<UnloadedExtensionInfo>(details).ptr();
     extension = info->extension;
   }
   if (extension == extension_) {
     GlobalErrorServiceFactory::GetForProfile(service_->profile())->
         RemoveGlobalError(this);
-    ReleaseMenuCommandID(menu_command_id_);
 
     if (type == chrome::NOTIFICATION_EXTENSION_LOADED)
       user_response_ = REENABLE;
     else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED)
       user_response_ = UNINSTALL;
     delete this;
   }
 }
 
 // Globals --------------------------------------------------------------------
 
 namespace extensions {
 
 void AddExtensionDisabledError(ExtensionService* service,
                                const Extension* extension) {
   GlobalErrorServiceFactory::GetForProfile(service->profile())->
       AddGlobalError(new ExtensionDisabledGlobalError(service, extension));
 }
 
 void ShowExtensionDisabledDialog(ExtensionService* service, Profile* profile,
                                  const Extension* extension) {
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(profile, service, extension);
 }
 
 }  // namespace extensions