Fix crashes related to the extension uninstall dialog.

chrome/browser/extensions/extensions_ui.cc

 // Copyright (c) 2011 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/extensions_ui.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/callback.h"
@@ skipping 261 matching lines @@
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
       NotificationService::AllSources());
   registrar_.Add(this,
       chrome::NOTIFICATION_BACKGROUND_CONTENTS_DELETED,
       NotificationService::AllSources());
   registrar_.Add(this,
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_VISIBILITY_CHANGED,
       NotificationService::AllSources());
 }
 
-ExtensionUninstallDialog* ExtensionsDOMHandler::GetExtensionUninstallDialog() {
-  if (!extension_uninstall_dialog_.get()) {
-    extension_uninstall_dialog_.reset(
-        new ExtensionUninstallDialog(Profile::FromWebUI(web_ui_)));
+ExtensionUninstallUI* ExtensionsDOMHandler::GetExtensionUninstallUI() {
+  if (!extension_uninstall_ui_.get()) {
+    extension_uninstall_ui_.reset(
+        new ExtensionUninstallUI(Profile::FromWebUI(web_ui_)));
   }
-  return extension_uninstall_dialog_.get();
+  return extension_uninstall_ui_.get();
 }
 
 void ExtensionsDOMHandler::HandleToggleDeveloperMode(const ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui_);
   bool developer_mode =
       profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode);
   profile->GetPrefs()->SetBoolean(prefs::kExtensionsUIDeveloperMode,
                                   !developer_mode);
 }
 
@@ skipping 108 matching lines @@
     LOG(ERROR) << "Attempt to uninstall an extension that is non-usermanagable "
                << "was made. Extension id : " << extension->id();
     return;
   }
 
   if (!extension_id_prompting_.empty())
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
 
-  GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
+  GetExtensionUninstallUI()->ConfirmUninstall(this, extension);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogAccepted() {
+void ExtensionsDOMHandler::ExtensionUninstallAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   bool was_terminated = false;
 
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id_prompting_, true);
   if (!extension) {
     extension = extension_service_->GetTerminatedExtension(
         extension_id_prompting_);
     was_terminated = true;
   }
   if (!extension)
     return;
 
   extension_service_->UninstallExtension(extension_id_prompting_,
                                          false /* external_uninstall */, NULL);
   extension_id_prompting_ = "";
 
   // There will be no EXTENSION_UNLOADED notification for terminated
   // extensions as they were already unloaded.
   if (was_terminated)
     HandleRequestExtensionsData(NULL);
 }
 
-void ExtensionsDOMHandler::ExtensionDialogCanceled() {
+void ExtensionsDOMHandler::ExtensionUninstallCanceled() {
   extension_id_prompting_ = "";
 }
 
 void ExtensionsDOMHandler::HandleOptionsMessage(const ListValue* args) {
   const Extension* extension = GetExtension(args);
   if (!extension || extension->options_url().is_empty())
     return;
   Profile::FromWebUI(web_ui_)->GetExtensionProcessManager()->OpenOptionsPage(
       extension, NULL);
 }
@@ skipping 340 matching lines @@
   return ResourceBundle::GetSharedInstance().
       LoadDataResourceBytes(IDR_PLUGIN);
 }
 
 // static
 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode,
                              false,
                              PrefService::SYNCABLE_PREF);
 }