Suffix Chrome's appid on user-level installs

chrome/installer/util/shell_util.h

Index: chrome/installer/util/shell_util.h
diff --git a/chrome/installer/util/shell_util.h b/chrome/installer/util/shell_util.h
index de06322a0526d36037f7176a7017d4a532d342dd..a9aaea5b55133c29c7e9bc67f5e19c88bb4184da 100644
--- a/chrome/installer/util/shell_util.h
+++ b/chrome/installer/util/shell_util.h
@@ -242,6 +242,15 @@ class ShellUtil {
   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
@@ -377,6 +386,7 @@ class ShellUtil {
   // |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,