Suffix Chrome's appid on user-level installs

ShellIntegration::GetAppId() --> ShellIntegration::GetProfileAppId() for clarity (i.e. having two functions called "GetAppId" is confusing imo).

Patch From Gabriel Charette <gab@chromium.org>
BUG=125362, 133173
TEST=Make sure 125362 doesn't repro.
http://goo.gl/ZZ7gE
ShellIntegrationTest.GetAppModelIdForProfileTest
ShellUtilTest.BuildAppModelId*
SessionRestoreTest.RestoreAfterClosingTabbedBrowserWithAppAndLaunching
AppModeTest.EnableAppModeTest

Review URL: https://chromiumcodereview.appspot.com/10542031
Patch from Gabriel Charette <gab@chromium.org>.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142909 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 9 deletions

diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index eb7d716..a1ce234 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -123,15 +123,19 @@ class ShellIntegration {
       bool is_platform_app);
 
 #if defined(OS_WIN)
-  // Generates Win7 app id for given app name and profile path. The returned app
-  // 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.
-  static string16 GetChromiumAppId(const FilePath& profile_path);
+  // Generates an application user model ID (AppUserModelId) for a given app
+  // name and profile path. The returned app id is in the format of
+  // "|app_name|[.<profile_id>]". "profile_id" is appended when user override
+  // the default value.
+  // 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 GetAppModelIdForProfile(const string16& app_name,
+                                          const FilePath& profile_path);
+
+  // Generates an application user model ID (AppUserModelId) for Chromium by
+  // calling GetAppModelIdForProfile() with ShellUtil::GetAppId() as app_name.
+  static string16 GetChromiumModelIdForProfile(const FilePath& profile_path);
 
   // Returns the path to the Chromium icon. This is used to specify the icon
   // to use for the taskbar group on Win 7.