Refactor of BrowserDistribution.

chrome/installer/util/installer_state.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/installer/util/installer_state.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 104 matching lines @@
 
   ensure_google_update_present_ =
       command_line.HasSwitch(installer::switches::kEnsureGoogleUpdatePresent);
 
   const bool is_uninstall = command_line.HasSwitch(switches::kUninstall);
 
   if (prefs.install_chrome()) {
     Product* p = AddProductFromPreferences(
         BrowserDistribution::CHROME_BROWSER, prefs, machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
-            << " distribution: " << p->distribution()->GetAppShortCutName();
+            << " distribution: " << p->distribution()->GetDisplayName();

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

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

   }
   if (prefs.install_chrome_frame()) {
     Product* p = AddProductFromPreferences(
         BrowserDistribution::CHROME_FRAME, prefs, machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
-            << " distribution: " << p->distribution()->GetAppShortCutName();
+            << " distribution: " << p->distribution()->GetDisplayName();
   }
 
   if (prefs.install_chrome_app_launcher()) {
     Product* p = AddProductFromPreferences(
         BrowserDistribution::CHROME_APP_HOST, prefs, machine_state);
     VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
-            << " distribution: " << p->distribution()->GetAppShortCutName();
+            << " distribution: " << p->distribution()->GetDisplayName();
   }
 
   if (!is_uninstall && is_multi_install()) {
     bool need_binaries = false;
     if (FindProduct(BrowserDistribution::CHROME_APP_HOST)) {
       // App Host will happily use Chrome at system level, or binaries at system
       // level, even if app host is user level.
       const ProductState* chrome_state = machine_state.GetProductState(
           true,  // system level
           BrowserDistribution::CHROME_BROWSER);
@@ skipping 12 matching lines @@
       need_binaries = true;
 
     if (FindProduct(BrowserDistribution::CHROME_FRAME))
       need_binaries = true;
 
     if (need_binaries && !FindProduct(BrowserDistribution::CHROME_BINARIES)) {
       // Force binaries to be installed/updated.
       Product* p = AddProductFromPreferences(
           BrowserDistribution::CHROME_BINARIES, prefs, machine_state);
       VLOG(1) << "Install distribution: "
-              << p->distribution()->GetAppShortCutName();
+              << p->distribution()->GetDisplayName();
     }
   }
 
   if (is_uninstall && prefs.is_multi_install()) {
     if (FindProduct(BrowserDistribution::CHROME_BROWSER)) {
       // Uninstall each product of type |type| listed below based on the
       // presence or absence of |switch_name| in that product's uninstall
       // command.
       const struct {
         BrowserDistribution::Type type;
@@ skipping 18 matching lines @@
         const ProductState* product_state = machine_state.GetProductState(
             system_install(), conditional_additions[i].type);
         if (product_state != NULL &&
             product_state->uninstall_command().HasSwitch(
                 conditional_additions[i].switch_name) ==
                     conditional_additions[i].switch_expected &&
             !FindProduct(conditional_additions[i].type)) {
           Product* p = AddProductFromPreferences(
               conditional_additions[i].type, prefs, machine_state);
           VLOG(1) << "Uninstall distribution: "
-                  << p->distribution()->GetAppShortCutName();
+                  << p->distribution()->GetDisplayName();
         }
       }
     }
 
     bool keep_binaries = false;
     // Look for a product that is not the binaries and that is not being
     // uninstalled. If not found, binaries are uninstalled too.
     for (size_t i = 0; i < BrowserDistribution::NUM_TYPES; ++i) {
       BrowserDistribution::Type type =
           static_cast<BrowserDistribution::Type>(i);
@@ skipping 31 matching lines @@
       }
 
       // The product is being uninstalled.
     }
     if (!keep_binaries &&
         machine_state.GetProductState(system_install(),
                                       BrowserDistribution::CHROME_BINARIES)) {
       Product* p = AddProductFromPreferences(
           BrowserDistribution::CHROME_BINARIES, prefs, machine_state);
       VLOG(1) << (is_uninstall ? "Uninstall" : "Install")
-              << " distribution: " << p->distribution()->GetAppShortCutName();
+              << " distribution: " << p->distribution()->GetDisplayName();
     }
   }
 
   BrowserDistribution* operand = NULL;
 
   if (is_uninstall) {
     operation_ = UNINSTALL;
   } else if (!prefs.is_multi_install()) {
     // For a single-install, the current browser dist is the operand.
     operand = BrowserDistribution::GetDistribution();
@@ skipping 517 matching lines @@
   }
   if (!install_list->Do())
     LOG(ERROR) << "Failed to record installer error information in registry.";
 }
 
 bool InstallerState::RequiresActiveSetup() const {
   return system_install() && FindProduct(BrowserDistribution::CHROME_BROWSER);
 }
 
 }  // namespace installer