Suffix Chrome's appid on user-level installs

chrome/installer/util/shell_util.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 methods that are useful for integrating Chrome in
 // Windows shell. These methods are all static and currently part of
 // ShellUtil class.
 
 #ifndef CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
 #define CHROME_INSTALLER_UTIL_SHELL_UTIL_H_
@@ skipping 224 matching lines @@
                                                const string16& chrome_exe);
 
   // Returns the application name of the program under |dist|.
   // This application name will be suffixed as is appropriate for the current
   // install.
   // This is the name that is registered with Default Programs on Windows and
   // that should thus be used to "make chrome default" and such.
   static string16 GetApplicationName(BrowserDistribution* dist,
                                      const string16& chrome_exe);
 
+  // Returns the appid of the program under |dist|.

[grt (UTC plus 2), 2012/06/15 03:03:03]

How about:
// Returns the AppUserModelID for |dist|. This identifier is unconditionally
suffixed with the user id for user-level installs (in contrast to other
registration entries which are suffixed as described in
GetCurrentInstallationSuffix above).

I like using the MS term for the thing here so that the reader (who will
understandably wonder what the heck this is for) can Google for it and be
educated by MSDN.

[gab, 2012/06/15 19:01:04]

Done.

+  // This appid will *always* be suffixed for user-level installs.

[grt (UTC plus 2), 2012/06/15 03:03:03]

please avoid *bold* in comments (blink tag is okay if you can get it to work,
though)

[gab, 2012/06/15 19:01:04]

<blink>Done.</blink>

+  // NOTE: This is different from ApplicationName and ChromeHTML which are
+  // *only* suffixed if the current installation is suffixed.
+  // This is the name under which Chrome is known as in the Windows shell
+  // environment.
+  static string16 GetAppId(BrowserDistribution* dist,
+                           const string16& chrome_exe);
+
   // Make Chrome the default browser. This function works by going through
   // the url protocols and file associations that are related to general
   // browsing, e.g. http, https, .html etc., and requesting to become the
   // default handler for each. If any of these fails the operation will return
   // false to indicate failure, which is consistent with the return value of
   // ShellIntegration::IsDefaultBrowser.
   //
   // In the case of failure any successful changes will be left, however no
   // more changes will be attempted.
   // TODO(benwells): Attempt to undo any changes that were successfully made.
@@ skipping 115 matching lines @@
     // Use an alternate, localized, application name for the shortcut.
     SHORTCUT_ALTERNATE = 1 << 2,
   };
 
   // Updates shortcut (or creates a new shortcut) at destination given by
   // shortcut to a target given by chrome_exe. The arguments are given by
   // |arguments| for the target and icon is set based on |icon_path| and
   // |icon_index|. If create_new is set to true, the function will create a new
   // shortcut if it doesn't exist.
   // |options|: bitfield for which the options come from ChromeShortcutOptions.
+  // This method should only be called after Chrome is registered.

[grt (UTC plus 2), 2012/06/15 03:03:03]

why?  because of the DCHECK, or is there a fundamental reason why registration
must be done before the shortcut is created?

[gab, 2012/06/15 19:01:04]

This was before we decided to always suffix the appid (as we needed to know what
ended being the suffix registered as we have to hardcode it in the shortcut).

Now that we always suffix, this is a non-issue.

   static bool UpdateChromeShortcut(BrowserDistribution* dist,
                                    const string16& chrome_exe,
                                    const string16& shortcut,
                                    const string16& arguments,
                                    const string16& description,
                                    const string16& icon_path,
                                    int icon_index,
                                    uint32 options);
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellUtil);
 };
 
 
 #endif  // CHROME_INSTALLER_UTIL_SHELL_UTIL_H_