Move app launcher and chrome apps shortcut strings into the installer

chrome/browser/shell_integration_linux_unittest.cc

 // Copyright 2013 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_linux.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <map>
 
@@ skipping 152 matching lines @@
   base::MessageLoop message_loop;
   content::TestBrowserThread file_thread(BrowserThread::FILE, &message_loop);
 
   // No existing shortcuts.
   {
     MockEnvironment env;
     ShellIntegration::ShortcutLocations result =
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_FALSE(result.in_applications_menu_chrome_apps_subdir);
+string16 GetAppListShortcutName() {

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

Why define this inline here and below?? Does this even compile?!

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

Whoa, how did that happen. removed.

+  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);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
 
   // Shortcut on desktop.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath desktop_path = temp_dir.path();
 
     MockEnvironment env;
     ASSERT_TRUE(file_util::CreateDirectory(desktop_path));
     ASSERT_FALSE(file_util::WriteFile(
         desktop_path.AppendASCII(kTemplateFilename),
         "", 0));
     ShellIntegration::ShortcutLocations result =
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_FALSE(result.in_applications_menu_chrome_apps_subdir);
+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);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
 
   // Shortcut in applications directory.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath apps_path = temp_dir.path().AppendASCII("applications");
 
     MockEnvironment env;
     env.Set("XDG_DATA_HOME", temp_dir.path().value());
     ASSERT_TRUE(file_util::CreateDirectory(apps_path));
     ASSERT_FALSE(file_util::WriteFile(
         apps_path.AppendASCII(kTemplateFilename),
         "", 0));
     ShellIntegration::ShortcutLocations result =
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_TRUE(result.in_applications_menu_chrome_apps_subdir);
+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);
+}
+
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
 
   // Shortcut in applications directory with NoDisplay=true.
   {
     base::ScopedTempDir temp_dir;
     ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
     base::FilePath apps_path = temp_dir.path().AppendASCII("applications");
 
     MockEnvironment env;
     env.Set("XDG_DATA_HOME", temp_dir.path().value());
     ASSERT_TRUE(file_util::CreateDirectory(apps_path));
     ASSERT_TRUE(file_util::WriteFile(
         apps_path.AppendASCII(kTemplateFilename),
         kNoDisplayDesktopFile, strlen(kNoDisplayDesktopFile)));
     ShellIntegration::ShortcutLocations result =
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId);
     // Doesn't count as being in applications menu.
     EXPECT_FALSE(result.on_desktop);
-    EXPECT_FALSE(result.in_applications_menu);
+    EXPECT_FALSE(result.in_applications_menu_chrome_apps_subdir);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_TRUE(result.hidden);
   }
 
   // Shortcut on desktop and in applications directory.
   {
     base::ScopedTempDir temp_dir1;
     ASSERT_TRUE(temp_dir1.CreateUniqueTempDir());
     base::FilePath desktop_path = temp_dir1.path();
 
     base::ScopedTempDir temp_dir2;
     ASSERT_TRUE(temp_dir2.CreateUniqueTempDir());
     base::FilePath apps_path = temp_dir2.path().AppendASCII("applications");
 
     MockEnvironment env;
     ASSERT_TRUE(file_util::CreateDirectory(desktop_path));
     ASSERT_FALSE(file_util::WriteFile(
         desktop_path.AppendASCII(kTemplateFilename),
         "", 0));
     env.Set("XDG_DATA_HOME", temp_dir2.path().value());
     ASSERT_TRUE(file_util::CreateDirectory(apps_path));
     ASSERT_FALSE(file_util::WriteFile(
         apps_path.AppendASCII(kTemplateFilename),
         "", 0));
     ShellIntegration::ShortcutLocations result =
         ShellIntegrationLinux::GetExistingShortcutLocations(
             &env, kProfilePath, kExtensionId, desktop_path);
     EXPECT_TRUE(result.on_desktop);
-    EXPECT_TRUE(result.in_applications_menu);
+    EXPECT_TRUE(result.in_applications_menu_chrome_apps_subdir);
     EXPECT_FALSE(result.in_quick_launch_bar);
     EXPECT_FALSE(result.hidden);
   }
 }
 
 TEST(ShellIntegrationTest, GetExistingShortcutContents) {
   const char kTemplateFilename[] = "shortcut-test.desktop";
   base::FilePath kTemplateFilepath(kTemplateFilename);
   const char kTestData1[] = "a magical testing string";
   const char kTestData2[] = "a different testing string";
@@ skipping 323 matching lines @@
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_cases); i++) {
     SCOPED_TRACE(i);
     EXPECT_EQ(
         test_cases[i].expected_output,
         ShellIntegrationLinux::GetDirectoryFileContents(
             ASCIIToUTF16(test_cases[i].title),
             test_cases[i].icon_name));
   }
 }