Refactor of BrowserDistribution.

chrome/installer/setup/setup_main.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 <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <string>
@@ skipping 151 matching lines @@
           static_cast<BrowserDistribution::Type>(i);
 
       if (!installer_state->FindProduct(type)) {
         const ProductState* state =
             original_state.GetProductState(installer_state->system_install(),
                                            type);
         if ((state != NULL) && state->is_multi_install()) {
           installer_state->AddProductFromState(type, *state);
           VLOG(1) << "Product already installed and must be included: "
                   << BrowserDistribution::GetSpecificDistribution(type)->
-                         GetAppShortCutName();
+                         GetDisplayName();

[huangs, 2013/05/21 21:35:41]

I don't think we should localize our logs. Please see comment in
browser_distribution.h.

         }
       }
     }
   }
 }
 
 // This function is called when --rename-chrome-exe option is specified on
 // setup.exe command line. This function assumes an in-use update has happened
 // for Chrome so there should be a file called new_chrome.exe on the file
 // system and a key called 'opv' in the registry. This function will move
@@ skipping 113 matching lines @@
         original_state.GetProductState(is_system_install, dist->GetType());
     // Is an earlier version of this product already installed?
     if (product_state != NULL &&
         product_state->version().CompareTo(new_version) < 0) {
       bool is_overridden = false;
       GoogleUpdateSettings::UpdatePolicy app_policy =
           GoogleUpdateSettings::GetAppUpdatePolicy(dist->GetAppGuid(),
                                                    &is_overridden);
       if (is_overridden && app_policy != binaries_policy) {
         LOG(ERROR) << "Found legacy Group Policy setting for "
-                   << dist->GetAppShortCutName() << " (value: " << app_policy
+                   << dist->GetDisplayName() << " (value: " << app_policy
                    << ") that does not match the setting for "
-                   << binaries_dist->GetAppShortCutName()
+                   << binaries_dist->GetDisplayName()
                    << " (value: " << binaries_policy << ").";
         settings_are_valid = false;
       }
     }
   }
 
   if (!settings_are_valid) {
     // TODO(grt): add " See http://goo.gl/+++ for details." to the end of this
     // log message and to the IDS_INSTALL_INCONSISTENT_UPDATE_POLICY string once
     // we have a help center article that explains why this error is being
     // reported and how to resolve it.
     LOG(ERROR) << "Cannot apply update on account of inconsistent "
                   "Google Update Group Policy settings. Use the Group Policy "
                   "Editor to set the update policy override for the "
-               << binaries_dist->GetAppShortCutName()
+               << binaries_dist->GetDisplayName()
                << " application and try again.";
     *status = installer::INCONSISTENT_UPDATE_POLICY;
     installer_state.WriteInstallerResult(
         *status, IDS_INSTALL_INCONSISTENT_UPDATE_POLICY_BASE, NULL);
   }
 
   return settings_are_valid;
 #endif  // defined(GOOGLE_CHROME_BUILD)
 }
 
@@ skipping 129 matching lines @@
   } else {
     // This is a non-multi installation.
 
     // Check for an existing installation of the product.
     const ProductState* product_state = original_state.GetProductState(
         system_level, products[0]->distribution()->GetType());
     if (product_state != NULL) {
       // Block downgrades from multi-install to single-install.
       if (product_state->is_multi_install()) {
         LOG(ERROR) << "Multi-install "
-                   << products[0]->distribution()->GetAppShortCutName()
+                   << products[0]->distribution()->GetDisplayName()
                    << " exists; aborting single install.";
         *status = installer::MULTI_INSTALLATION_EXISTS;
         installer_state->WriteInstallerResult(*status,
             IDS_INSTALL_MULTI_INSTALLATION_EXISTS_BASE, NULL);
         return false;
       }
     }
   }
 
   return true;
@@ skipping 271 matching lines @@
       const Products& products = installer_state.products();
       for (Products::const_iterator it = products.begin(); it < products.end();
            ++it) {
         const Product& product = **it;
         const ProductState* product_state =
             original_state.GetProductState(system_install,
                                            product.distribution()->GetType());
         if (product_state != NULL &&
             (product_state->version().CompareTo(*installer_version) > 0)) {
           LOG(ERROR) << "Higher version of "
-                     << product.distribution()->GetAppShortCutName()
+                     << product.distribution()->GetDisplayName()
                      << " is already installed.";
           higher_products |= (1 << product.distribution()->GetType());
         }
       }
 
       if (higher_products != 0) {
         COMPILE_ASSERT(BrowserDistribution::NUM_TYPES == 4,
                        add_support_for_new_products_here_);
         const uint32 kBrowserBit = 1 << BrowserDistribution::CHROME_BROWSER;
         const uint32 kGCFBit = 1 << BrowserDistribution::CHROME_FRAME;
@@ skipping 225 matching lines @@
     bool remove_all,
     bool force_uninstall,
     const Product& product) {
   const ProductState* product_state =
       original_state.GetProductState(installer_state.system_install(),
                                      product.distribution()->GetType());
   if (product_state != NULL) {
     VLOG(1) << "version on the system: "
             << product_state->version().GetString();
   } else if (!force_uninstall) {
-    LOG(ERROR) << product.distribution()->GetAppShortCutName()
+    LOG(ERROR) << product.distribution()->GetDisplayName()
                << " not found for uninstall.";
     return installer::CHROME_NOT_INSTALLED;
   }
 
   return installer::UninstallProduct(
       original_state, installer_state, cmd_line.GetProgram(), product,
       remove_all, force_uninstall, cmd_line);
 }
 
 installer::InstallStatus UninstallProducts(
@@ skipping 151 matching lines @@
       original_state.GetProductState(false,
                                      BrowserDistribution::CHROME_BROWSER);
   if (!existing_chrome) {
     existing_chrome =
       original_state.GetProductState(true, BrowserDistribution::CHROME_BROWSER);
   }
   if (existing_chrome) {
     static const wchar_t kPleaseUninstallYourChromeMessage[] =
         L"You already have a full-installation (non-dev) of %1ls, please "
         L"uninstall it first using Add/Remove Programs in the control panel.";
-    string16 name(chrome_dist->GetAppShortCutName());
+    string16 name(chrome_dist->GetDisplayName());
     string16 message(base::StringPrintf(kPleaseUninstallYourChromeMessage,
                                         name.c_str()));
 
     LOG(ERROR) << "Aborting operation: another installation of " << name
                << " was found, as a last resort (if the product is not present "
                   "in Add/Remove Programs), try executing: "
                << existing_chrome->uninstall_command().GetCommandLineString();
     MessageBox(NULL, message.c_str(), NULL, MB_ICONERROR);
     return installer::INSTALL_FAILED;
   }
@@ skipping 247 matching lines @@
     for (Products::const_iterator it = products.begin(); it < products.end();
          ++it) {
       const Product& product = **it;
       BrowserDistribution* browser_dist = product.distribution();
       // We started as system-level and have been re-launched as user level
       // to continue with the toast experiment.
       Version installed_version;
       InstallUtil::GetChromeVersion(browser_dist, true, &installed_version);
       if (!installed_version.IsValid()) {
         LOG(ERROR) << "No installation of "
-                   << browser_dist->GetAppShortCutName()
+                   << browser_dist->GetDisplayName()
                    << " found for system-level toast.";
       } else {
         product.LaunchUserExperiment(
             cmd_line.GetProgram(), installer::REENTRY_SYS_UPDATE, true);
       }
     }
   } else if (cmd_line.HasSwitch(
                  installer::switches::kChromeFrameReadyModeOptIn)) {
     *exit_code = InstallUtil::GetInstallReturnCode(
         installer::ChromeFrameReadyModeOptIn(original_state, *installer_state));
@@ skipping 245 matching lines @@
       int num_products = 0;
       for (Products::const_iterator it = products.begin(); it < products.end();
            ++it) {
         if (!(*it)->is_chrome_binaries())
           ++num_products;
       }
       if (num_products == 1U) {
         ::MessageBoxW(NULL,
                       installer::GetLocalizedString(
                           IDS_UNINSTALL_COMPLETE_BASE).c_str(),
-                      cf_install->distribution()->GetAppShortCutName().c_str(),
+                      cf_install->distribution()->GetDisplayName().c_str(),
                       MB_OK);
       }
     }
   }
 
   int return_code = 0;
   // MSI demands that custom actions always return 0 (ERROR_SUCCESS) or it will
   // rollback the action. If we're uninstalling we want to avoid this, so always
   // report success, squashing any more informative return codes.
   if (!(installer_state.is_msi() && is_uninstall))
     // Note that we allow the status installer::UNINSTALL_REQUIRES_REBOOT
     // to pass through, since this is only returned on uninstall which is
     // never invoked directly by Google Update.
     return_code = InstallUtil::GetInstallReturnCode(install_status);
 
   VLOG(1) << "Installation complete, returning: " << return_code;
 
   return return_code;
 }