Suffix Chrome's appid on user-level installs

chrome/browser/shell_integration.h

Index: chrome/browser/shell_integration.h
diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index eb7d716c6e81a1cfdf6b450fbc80e300f657fee4..ba4ba9487ff75d74512eed00122fd83428e671ec 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -126,11 +126,14 @@ class ShellIntegration {
   // Generates Win7 app id for given app name and profile path. The returned app

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

"Generates an application user model ID (AppUserModelID) for a given..."

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

Done.

   // id is in the format of "|app_name|[.<profile_id>]". "profile_id" is
   // appended when user override the default value.
-  static string16 GetAppId(const string16& app_name,
-                           const FilePath& profile_path);
-
-  // Generates Win7 app id for Chromium by calling GetAppId with
-  // chrome::kBrowserAppID as app_name.
+  // Note: If the app has an installation specific suffix (e.g. on user-level
+  // Chrome installs), |app_name| should already be suffixed, this method will
+  // then further suffix it with the profile id as described above.
+  static string16 GetProfileAppId(const string16& app_name,

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

"Profile" in the name of this function is misleading.  the point of this
function is to return a user model id that is specific to some app (not
necessarily chrome/chromium) and a profile.  i suggest changing this method to
GetAppModelId and the one below to GetChromiumModelId.  or something like that.

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

I like :).

+                                  const FilePath& profile_path);
+
+  // Generates Win7 app id for Chromium by calling GetProfileAppId with

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

"Generates an application user model ID (AppUserModelID) for Chromium..."

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

Done.

+  // ShellUtil::GetAppId as app_name.
   static string16 GetChromiumAppId(const FilePath& profile_path);
 
   // Returns the path to the Chromium icon. This is used to specify the icon