Suffix Chrome's appid on user-level installs

chrome/browser/ui/web_applications/web_app_ui.cc

Index: chrome/browser/ui/web_applications/web_app_ui.cc
diff --git a/chrome/browser/ui/web_applications/web_app_ui.cc b/chrome/browser/ui/web_applications/web_app_ui.cc
index 6e36ba8e0f7f55423faef3a2f906aac65c84750d..067dc4c1a6c180aa653310cd8c02c5e9bf6b8e37 100644
--- a/chrome/browser/ui/web_applications/web_app_ui.cc
+++ b/chrome/browser/ui/web_applications/web_app_ui.cc
@@ -9,6 +9,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
+#include "base/string16.h"

[sky, 2012/06/15 21:23:09]

sort

[gab, 2012/06/15 21:29:25]

Done.

 #include "base/win/windows_version.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
@@ -248,7 +249,7 @@ void UpdateShortcutWorker::UpdateShortcutsOnFileThread() {
   CheckExistingShortcuts();
   if (!shortcut_files_.empty()) {
     // Generates app id from web app url and profile path.
-    std::wstring app_id = ShellIntegration::GetAppId(
+    string16 app_id = ShellIntegration::GetAppModelId(
         UTF8ToWide(web_app::GenerateApplicationNameFromURL(shortcut_info_.url)),
         profile_path_);