Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/web_applications/web_app.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/web_applications/web_app.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/string_util.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/url_constants.h"
+#include "chrome/installer/util/browser_distribution.h"
 #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;
 
 namespace {
 
 #if defined(TOOLKIT_VIEWS)
@@ skipping 193 matching lines @@
 #endif
 
 #if defined(TOOLKIT_GTK)
 std::string GetWMClassFromAppName(std::string app_name) {
   file_util::ReplaceIllegalCharactersInPath(&app_name, '_');
   TrimString(app_name, "_", &app_name);
   return app_name;
 }
 #endif
 
 string16 GetAppShortcutsSubdirName() {

[gab, 2013/05/15 21:26:38]

You shouldn't need this method, just use ShellUtil::GetShortcutPath().

[calamity, 2013/08/27 07:59:35]

As far as I'm aware, I can't use BrowserDistribution here? This code is used on
mac and linux. I guess I should put an #if(!OS_WIN) around this function so that
the windows implementation doesn't use it?

[gab, 2013/08/28 19:52:27]

Ah, right, installer_util target is linked on non-windows platform though I
believe; I'm not exactly sure, but I think it's okay to use BD on non-Win
platforms.

[calamity, 2013/09/20 05:54:52]

It didn't work on linux. The installer_util target exists but doesn't include
browser_distribution as a source. I tried changing the gyp files but there's a
lot that includes of windows.h, etc. Is there anyone working on making
BrowserDistribution work across different platforms?

shell_integration_linux needs to get the information that
GetAppShortcutsSubdirName() provides. It was getting it through the
applications_menu_subdir string but that's getting removed here. I guess we
could copy the contents of GetAppShortcutsSubdirName() into web_app_mac.mm and
shell_integration_linux.mm so they both know how to get their "Chrome Apps"
directory name.

WDYT?

-  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);
+  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  return dist->GetAppShortcutsSubdirName();
 }
 
 }  // namespace web_app