extensions: Refactor ExtensionInstallUI class.

chrome/browser/ui/webui/app_launcher_handler.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/ui/webui/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/metrics/histogram.h"
@@ skipping 45 matching lines @@
   extension_misc::AppLaunchBucket bucket =
       static_cast<extension_misc::AppLaunchBucket>(bucket_num);
   CHECK(bucket < extension_misc::APP_LAUNCH_BUCKET_BOUNDARY);
   return bucket;
 }
 
 }  // namespace
 
 AppLauncherHandler::AppLauncherHandler(ExtensionService* extension_service)
     : extensions_service_(extension_service),
-      extension_prompt_type_(ExtensionInstallUI::UNSET_PROMPT_TYPE),
+      is_uninstall_dialog_(false),
       promo_active_(false),
       ignore_changes_(false) {
 }
 
 AppLauncherHandler::~AppLauncherHandler() {}
 
 // static
 void AppLauncherHandler::CreateAppInfo(const Extension* extension,
                                        ExtensionPrefs* prefs,
                                        DictionaryValue* value) {
@@ skipping 322 matching lines @@
   std::string extension_id = UTF16ToUTF8(ExtractStringValue(args));
   const Extension* extension = extensions_service_->GetExtensionById(
       extension_id, false);
   if (!extension)
     return;
 
   if (!extension_id_prompting_.empty())
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
-  extension_prompt_type_ = ExtensionInstallUI::UNINSTALL_PROMPT;
-  GetExtensionInstallUI()->ConfirmUninstall(this, extension);
+  is_uninstall_dialog_ = true;
+  GetExtensionGenericDialog()->ConfirmUninstall(this, extension);
 }
 
 void AppLauncherHandler::HandleHideAppsPromo(const ListValue* args) {
   // If the user has intentionally hidden the promotion, we'll uninstall all the
   // default apps (we know the user hasn't installed any apps on their own at
   // this point, or the promotion wouldn't have been shown).
   UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
                             extension_misc::PROMO_CLOSE,
                             extension_misc::PROMO_BUCKET_BOUNDARY);
 
@@ skipping 110 matching lines @@
     // Launch app asynchronously so the image will update.
     StringValue* app_id = Value::CreateStringValue(extension->id());
     web_ui_->CallJavascriptFunction("launchAppAfterEnable", *app_id);
     return;
   }
 
   if (!extension_id_prompting_.empty())
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
-  extension_prompt_type_ = ExtensionInstallUI::RE_ENABLE_PROMPT;
+  is_uninstall_dialog_ = false;
   GetExtensionInstallUI()->ConfirmReEnable(this, extension);
 }
 
-void AppLauncherHandler::InstallUIProceed() {
+void AppLauncherHandler::ExtensionDialogAccepted() {
   DCHECK(!extension_id_prompting_.empty());
 
   // The extension can be uninstalled in another window while the UI was
   // showing. Do nothing in that case.
   const Extension* extension =
       extensions_service_->GetExtensionById(extension_id_prompting_, true);
   if (!extension)
     return;
 
-  switch (extension_prompt_type_) {
-    case ExtensionInstallUI::UNINSTALL_PROMPT:
+  if (is_uninstall_dialog_) {
       extensions_service_->UninstallExtension(extension_id_prompting_,
                                               false /* external_uninstall */);
-      break;
-    case ExtensionInstallUI::RE_ENABLE_PROMPT: {
+  } else {
       extensions_service_->GrantPermissionsAndEnableExtension(extension);
 
       // We bounce this off the NTP so the browser can update the apps icon.
       // If we don't launch the app asynchronously, then the app's disabled
       // icon disappears but isn't replaced by the enabled icon, making a poor
       // visual experience.
       StringValue* app_id = Value::CreateStringValue(extension->id());
       web_ui_->CallJavascriptFunction("launchAppAfterEnable", *app_id);
-      break;
-    }
-    default:
-      NOTREACHED();
-      break;
   }
 
   extension_id_prompting_ = "";
 }
 
-void AppLauncherHandler::InstallUIAbort() {
+void AppLauncherHandler::ExtensionDialogCanceled() {
   extension_id_prompting_ = "";
 }
 
+void AppLauncherHandler::InstallUIProceed() {
+  ExtensionDialogAccepted();

[Aaron Boodman, 2011/03/24 19:22:03]

Since the code to run in the uninstall case and the re-enable case is pretty
different, I think it would be cleaner to get rid of the is_uninstall_dialog_
boolean and just do the re-enable work here.

[tfarina, 2011/03/24 21:39:47]

Done.

+}
+
+void AppLauncherHandler::InstallUIAbort() {
+  ExtensionDialogCanceled();
+}
+
+ExtensionGenericDialog* AppLauncherHandler::GetExtensionGenericDialog() {
+  if (!extension_generic_dialog_.get()) {
+    extension_generic_dialog_.reset(
+        new ExtensionGenericDialog(web_ui_->GetProfile()));
+  }
+  return extension_generic_dialog_.get();
+}
+
 ExtensionInstallUI* AppLauncherHandler::GetExtensionInstallUI() {
-  if (!install_ui_.get())
-    install_ui_.reset(new ExtensionInstallUI(web_ui_->GetProfile()));
-  return install_ui_.get();
+  if (!extension_install_ui_.get()) {
+    extension_install_ui_.reset(
+        new ExtensionInstallUI(web_ui_->GetProfile()));
+  }
+  return extension_install_ui_.get();
 }
 
 void AppLauncherHandler::UninstallDefaultApps() {
   DefaultApps* default_apps = extensions_service_->default_apps();
   const ExtensionIdSet& app_ids = default_apps->default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extensions_service_->GetExtensionById(*iter, true))
       extensions_service_->UninstallExtension(*iter, false);
   }
 }