Append profile info to win7 app id per issue 30414

Add profile info to app id for non-default profile so that win7 could
group chrome icons based on profile.
- Add a new chrome/common/win_util.h/cc to hold app id functions that
  would include profile info for non-default profiles;
- Add unit test to the new GetChromiumAppId function;
- Browser and JumpList to use the GetChromiumAppId for BrowserWindow
  and JumpList;
- UserDataManager to use it for shortcuts it creates;
- Make app id for web apps include profile info as well;
- Change web_app::UpdateShortcuts to just update shortcuts description,
  icon and app id;

BUG=30414
TEST=Verify fix for issue 30414.

Review URL: http://codereview.chromium.org/506079

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

1 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h
index 9e7b8bb..5acea09 100644
--- a/chrome/browser/shell_integration.h
+++ b/chrome/browser/shell_integration.h
@@ -74,6 +74,18 @@ class ShellIntegration {
   static void CreateDesktopShortcut(const ShortcutInfo& shortcut_info);
 #endif  // defined(OS_LINUX)
 
+#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 std::wstring GetAppId(const wchar_t* app_name,
+                               const FilePath& profile_path);
+
+  // Generates Win7 app id for Chromium by calling GetAppId with
+  // chrome::kBrowserAppID as app_name.
+  static std::wstring GetChromiumAppId(const FilePath& profile_path);
+#endif  // defined(OS_WIN)
+
   // The current default browser UI state
   enum DefaultBrowserUIState {
     STATE_PROCESSING,