Abstract suffixing logic away from GetApplicationName

chrome/installer/util/browser_distribution.h

 // 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 declares a class that contains various method related to branding.
 
 #ifndef CHROME_INSTALLER_UTIL_BROWSER_DISTRIBUTION_H_
 #define CHROME_INSTALLER_UTIL_BROWSER_DISTRIBUTION_H_
 #pragma once
 
@@ skipping 51 matching lines @@
   Type GetType() const { return type_; }
 
   virtual void DoPostUninstallOperations(const Version& version,
                                          const FilePath& local_data_path,
                                          const string16& distribution_data);
 
   virtual string16 GetAppGuid();
 
   // Returns the name by which the program is registered with Default Programs.
   // This is not a localized string suitable for presenting to a user.
-  // This name should then usually be suffixed for user-level installs.
-  virtual string16 GetApplicationName();
+  // The name returned will already be suffixed, if necessary, for user-level
+  // installs.
+  string16 GetAppName();
+
+  // Returns the unsuffixed application name of this program.
+  // IMPORTANT: This should only be called by the installer which needs to make
+  // decisions on the suffixing of the upcoming install (or by logging code that
+  // doesn't care about the suffixes), not by external callers at run-time.
+  virtual string16 GetUnsuffixedAppName();
 
   // Returns the localized name of the program.
   virtual string16 GetAppShortCutName();
 
   virtual string16 GetAlternateApplicationName();
 
   virtual string16 GetBrowserAppId();
 
   virtual string16 GetInstallSubDir();
 
@@ skipping 79 matching lines @@
 
   const Type type_;
 
  private:
   BrowserDistribution();
 
   DISALLOW_COPY_AND_ASSIGN(BrowserDistribution);
 };
 
 #endif  // CHROME_INSTALLER_UTIL_BROWSER_DISTRIBUTION_H_