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, 10 insertions, 8 deletions

diff --git a/chrome/browser/user_data_manager.cc b/chrome/browser/user_data_manager.cc
index e7d71c2..01057be 100644
--- a/chrome/browser/user_data_manager.cc
+++ b/chrome/browser/user_data_manager.cc
@@ -25,6 +25,7 @@
 
 #if defined(OS_WIN)
 #include <windows.h>
+#include "chrome/browser/shell_integration.h"
 #include "chrome/installer/util/shell_util.h"
 #endif
 
@@ -291,14 +292,15 @@ bool UserDataManager::CreateDesktopShortcutForProfile(
   shortcut_name.append(L".lnk");
   file_util::AppendToPath(&shortcut_path, shortcut_name);
 
-  return file_util::CreateShortcutLink(cmd.c_str(),
-                                       shortcut_path.c_str(),
-                                       exe_folder.c_str(),
-                                       args.c_str(),
-                                       NULL,
-                                       exe_path.c_str(),
-                                       0,
-                                       chrome::kBrowserAppID);
+  return file_util::CreateShortcutLink(
+      cmd.c_str(),
+      shortcut_path.c_str(),
+      exe_folder.c_str(),
+      args.c_str(),
+      NULL,
+      exe_path.c_str(),
+      0,
+      ShellIntegration::GetChromiumAppId(FilePath(user_data_dir)).c_str());
 #else
   // TODO(port): should probably use freedesktop.org standard for desktop files.
   NOTIMPLEMENTED();