Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/ui/views/app_list/win/app_list_service_win.cc

Index: chrome/browser/ui/views/app_list/win/app_list_service_win.cc
diff --git a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
index 91a8e03b6c6296c827a54e3214a366b31741df0b..5ba8c066950af804393a7eeea9112c1284374d7a 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
+++ b/chrome/browser/ui/views/app_list/win/app_list_service_win.cc
@@ -111,24 +111,9 @@ void MigrateAppLauncherEnabledPref() {
   }
 }
 
-// Icons are added to the resources of the DLL using icon names. The icon index
-// for the app list icon is named IDR_X_APP_LIST or (for official builds)
-// IDR_X_APP_LIST_SXS for Chrome Canary. Creating shortcuts needs to specify a
-// resource index, which are different to icon names.  They are 0 based and
-// contiguous. As Google Chrome builds have extra icons the icon for Google
-// Chrome builds need to be higher. Unfortunately these indexes are not in any
-// generated header file.
 int GetAppListIconIndex() {
-  const int kAppListIconIndex = 5;
-  const int kAppListIconIndexSxS = 6;
-  const int kAppListIconIndexChromium = 1;
-#if defined(GOOGLE_CHROME_BUILD)
-  if (InstallUtil::IsChromeSxSProcess())
-    return kAppListIconIndexSxS;
-  return kAppListIconIndex;
-#else
-  return kAppListIconIndexChromium;
-#endif
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  return dist->GetIconIndex(BrowserDistribution::SHORTCUT_APP_LAUNCHER);
 }
 
 string16 GetAppListIconPath() {
@@ -146,10 +131,8 @@ string16 GetAppListIconPath() {
 }
 
 string16 GetAppListShortcutName() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY)
-    return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME_CANARY);
-  return l10n_util::GetStringUTF16(IDS_APP_LIST_SHORTCUT_NAME);
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  return dist->GetShortcutName(BrowserDistribution::SHORTCUT_APP_LAUNCHER);
 }
 
 CommandLine GetAppListCommandLine() {
@@ -509,11 +492,8 @@ void AppListServiceWin::CreateShortcut() {
   ShellIntegration::ShortcutLocations shortcut_locations;
   shortcut_locations.on_desktop = true;
   shortcut_locations.in_quick_launch_bar = true;
-  shortcut_locations.in_applications_menu = true;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  shortcut_locations.applications_menu_subdir =
-      dist->GetStartMenuShortcutSubfolder(
-          BrowserDistribution::SUBFOLDER_CHROME);
+  shortcut_locations.applications_menu_location =
+      ShellIntegration::APP_MENU_LOCATION_SUBDIR_CHROME;
   base::FilePath user_data_dir(
       g_browser_process->profile_manager()->user_data_dir());