Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration.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/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/policy/policy_path_parser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
 #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
     ShellIntegration::CanSetAsDefaultProtocolClient() {
   // Allowed as long as the browser can become the operating system default
   // browser.
   return CanSetAsDefaultBrowser();
 }
 
 ShellIntegration::ShortcutInfo::ShortcutInfo()
     : is_platform_app(false) {
 }
 
 ShellIntegration::ShortcutInfo::~ShortcutInfo() {}
 
 ShellIntegration::ShortcutLocations::ShortcutLocations()
     : on_desktop(false),
-      in_applications_menu(false),
+      applications_menu_location(APP_MENU_LOCATION_NONE),
       in_quick_launch_bar(false),
       hidden(false) {
 }
 
 static const struct ShellIntegration::AppModeInfo* gAppModeInfo = NULL;
 
 // static
 void ShellIntegration::SetAppModeInfo(const struct AppModeInfo* info) {
   gAppModeInfo = info;
 }
@@ skipping 49 matching lines @@
   } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
     // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
     new_cmd_line.AppendSwitchASCII(switches::kApp, url.spec());
   }
   return new_cmd_line;
 }
 
 #if !defined(OS_WIN)
+
+base::string16 ShellIntegration::GetAppShortcutsSubdirName() {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();

[gab, 2013/10/17 15:13:31]

I think this can be inlined below and still fit on a single line in the if.

[calamity, 2013/11/20 05:43:30]

Done.

+  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);
+}
+
 // static
 bool ShellIntegration::SetAsDefaultBrowserInteractive() {
   return false;
 }
 
 // static
 bool ShellIntegration::SetAsDefaultProtocolClientInteractive(
     const std::string& protocol) {
   return false;
 }
@@ skipping 175 matching lines @@
     case ShellIntegration::SET_DEFAULT_INTERACTIVE:
       if (interactive_permitted) {
         result = ShellIntegration::SetAsDefaultProtocolClientInteractive(
             protocol_);
       }
       break;
   }
 
   return result;
 }