Abstract suffixing logic away from GetApplicationName

chrome/installer/util/browser_distribution.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.
 //
 // This file defines a class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
 
 #include "base/atomicops.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
 #include "chrome/installer/util/chromium_binaries_distribution.h"
 #include "chrome/installer/util/google_chrome_distribution.h"
 #include "chrome/installer/util/google_chrome_binaries_distribution.h"
 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/master_preferences.h"
+#include "chrome/installer/util/shell_util.h"
 
 #include "installer_util_strings.h"  // NOLINT
 
 using installer::MasterPreferences;
 
 namespace {
 
 const wchar_t kCommandExecuteImplUuid[] =
     L"{A2DF06F9-A21A-44A8-8A99-8B9C84F29160}";
 const wchar_t kDelegateExecuteLibUuid[] =
@@ skipping 104 matching lines @@
 
 void BrowserDistribution::DoPostUninstallOperations(
     const Version& version, const FilePath& local_data_path,
     const string16& distribution_data) {
 }
 
 string16 BrowserDistribution::GetAppGuid() {
   return L"";
 }
 
-string16 BrowserDistribution::GetApplicationName() {
+string16 BrowserDistribution::GetAppName() {
+  string16 app_name(GetUnsuffixedAppName());
+  app_name += ShellUtil::GetCurrentInstallationSuffix();

[grt (UTC plus 2), 2012/06/01 14:11:29]

Please move this functionality into ShellUtil and change consumers so that
instead of calling BrowserDistribution::GetApplicationName and then doing stuff
to it, they call ShellUtil::GetApplicationName (or somesuch), which gets the
base part from a BrowserDistribution* and then adds the suffix if needed.

[gab, 2012/06/01 16:29:19]

Done.

+  return app_name;
+}
+
+string16 BrowserDistribution::GetUnsuffixedAppName() {
   return L"Chromium";
 }
 
 string16 BrowserDistribution::GetAppShortCutName() {
-  return GetApplicationName();
+  return GetUnsuffixedAppName();
 }
 
 string16 BrowserDistribution::GetAlternateApplicationName() {
   return L"The Internet";
 }
 
 string16 BrowserDistribution::GetBrowserAppId() {
   return L"Chromium";
 }
 
@@ skipping 102 matching lines @@
     const Version& version, const installer::Product& product,
     bool system_level) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment(int flavor,
     const string16& experiment_group,
     const installer::Product& installation,
     const FilePath& application_path) {
 }