Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration.cc

Index: chrome/browser/shell_integration.cc
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc
index e2959045e2beed99a74cdfcc85592e48d0296667..151ce18055a3185916973557cb7b99bc9ef7986f 100644
--- a/chrome/browser/shell_integration.cc
+++ b/chrome/browser/shell_integration.cc
@@ -22,6 +22,12 @@
 #include "chromeos/chromeos_switches.h"
 #endif
 
+#if !defined(OS_WIN)
+#include "chrome/common/chrome_version_info.h"
+#include "grit/chromium_strings.h"
+#include "ui/base/l10n/l10n_util.h"
+#endif
+
 using content::BrowserThread;
 
 ShellIntegration::DefaultWebClientSetPermission
@@ -39,9 +45,11 @@ ShellIntegration::ShortcutInfo::~ShortcutInfo() {}
 
 ShellIntegration::ShortcutLocations::ShortcutLocations()
     : on_desktop(false),
-      in_applications_menu(false),
-      in_quick_launch_bar(false),
-      hidden(false) {
+      applications_menu_location(APP_MENU_LOCATION_NONE),
+      in_quick_launch_bar(false) {
+#if defined(OS_POSIX)
+  hidden = false;
+#endif

[gab, 2013/11/21 05:50:19]

Please change this to:

     : on_desktop(false),
       applications_menu_location(APP_MENU_LOCATION_NONE),
       in_quick_launch_bar(false)
#if defined(OS_POSIX)
       , hidden(false)
#endif
       {

i.e. as done elsewhere in the codebase: http://goo.gl/spWFVx

[calamity, 2013/11/24 23:55:15]

Done.

 }
 
 static const struct ShellIntegration::AppModeInfo* gAppModeInfo = NULL;
@@ -109,6 +117,13 @@ CommandLine ShellIntegration::CommandLineArgsForLauncher(
 }
 
 #if !defined(OS_WIN)
+
+base::string16 ShellIntegration::GetAppShortcutsSubdirName() {
+  if (chrome::VersionInfo::GetChannel() == chrome::VersionInfo::CHANNEL_CANARY)
+    return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);
+  return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);
+}
+
 // static
 bool ShellIntegration::SetAsDefaultBrowserInteractive() {
   return false;