Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration_win.cc

Index: chrome/browser/shell_integration_win.cc
diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 5dd80834c0ab7b81ce673f99f255d24c920ac2c2..f974e8978055020f4ae9c4d4d1f46f17b1b103f6 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -83,6 +83,22 @@ string16 GetAppListAppName() {
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   string16 app_name(dist->GetBaseAppId());
   app_name.append(kAppListAppNameSuffix);
+
+  // Append user specific suffix to app id.
+  base::FilePath chrome_exe;
+  if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
+    NOTREACHED();
+    return app_name;
+  }
+  bool is_per_user_install =
+    InstallUtil::IsPerUserInstall(chrome_exe.value().c_str());
+  string16 suffix;
+  if (is_per_user_install
+      && !ShellUtil::GetUserSpecificRegistrySuffix(&suffix)) {
+    NOTREACHED();
+    return app_name;
+  }
+  app_name.append(suffix);

[gab, 2013/04/26 15:21:03]

The reason for Chrome that the suffix is attached to the app_name (Chrome) as a
single component is legacy. The suffix used to be much less restricted (i.e.
before I refactored everything to make it respect the rules for appid, progid,
etc. as violations of those rules were breaking Chrome on Windows 8); Much of
the code takes the suffix as a string and appends it directly to the {appid,
app_name, progid}. The refactoring was already pretty big at the time and I
didn't want to tweak all of these methods further. I feel there is another
reason (perhaps simplicity to support the old-style suffix, see
GetOldUserSpecificRegistrySuffix() if you're curious). This could probably be
fixed in its own CL, but I'm not convinced it's worth it.

The result of BuilAppModelId for a given set of components is always the same;
if the suffix is truncated it hinders it's uniqueness, but it's really not that
bad given it's already extremely unique (i.e. 32^26 possibilities..!).

[calamity, 2013/04/29 07:20:05]

Ah ok, cool. Part of the reason I was asking was that I thought that losing a
'.' character would affect things. Either way, this has been removed so it's
moot.

   return app_name;
 }