Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/web_applications/web_app.cc

Index: chrome/browser/web_applications/web_app.cc
diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc
index 072bbf07cc16b47437f33fdbe93dd5f84069fbda..4cc27463a827cd1263455ca5dae88a41e7a0556d 100644
--- a/chrome/browser/web_applications/web_app.cc
+++ b/chrome/browser/web_applications/web_app.cc
@@ -16,10 +16,9 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/installer/util/browser_distribution.h"

[gab, 2013/10/03 17:22:49]

Remove unused include.

[calamity, 2013/10/14 02:24:25]

Done.

 #include "content/public/browser/browser_thread.h"
 #include "extensions/common/constants.h"
-#include "grit/chromium_strings.h"
-#include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
 
@@ -236,11 +235,4 @@ std::string GetWMClassFromAppName(std::string app_name) {
 }
 #endif
 
-string16 GetAppShortcutsSubdirName() {
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (channel == chrome::VersionInfo::CHANNEL_CANARY)
-    return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME_CANARY);
-  return l10n_util::GetStringUTF16(IDS_APP_SHORTCUTS_SUBDIR_NAME);
-}
-
 }  // namespace web_app