Linux: The App Launcher now appears on the "Internet" menu, not "Other".

chrome/browser/shell_integration_linux.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_linux.h"
 
 #include <fcntl.h>
 #include <glib.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ skipping 32 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "grit/chrome_unscaled_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_family.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace {
 
+// The Categories for the App Launcher desktop shortcut. Should be the same as
+// the Chrome desktop shortcut, so they are in the same sub-menu.
+const char kAppListCategories[] = "Network;WebBrowser;";
+
 // Helper to launch xdg scripts. We don't want them to ask any questions on the
 // terminal etc. The function returns true if the utility launches and exits
 // cleanly, in which case |exit_code| returns the utility's exit code.
 bool LaunchXdgUtility(const std::vector<std::string>& argv, int* exit_code) {
   // xdg-settings internally runs xdg-mime, which uses mv to move newly-created
   // files on top of originals after making changes to them. In the event that
   // the original files are owned by another user (e.g. root, which can happen
   // if they are updated within sudo), mv will prompt the user to confirm if
   // standard input is a terminal (otherwise it just does it). So make sure it's
   // not, to avoid locking everything up waiting for mv.
@@ skipping 687 matching lines @@
 }
 
 std::string GetDesktopFileContents(
     const base::FilePath& chrome_exe_path,
     const std::string& app_name,
     const GURL& url,
     const std::string& extension_id,
     const base::string16& title,
     const std::string& icon_name,
     const base::FilePath& profile_path,
+    const std::string& categories,
     bool no_display) {
   CommandLine cmd_line = ShellIntegration::CommandLineArgsForLauncher(
       url, extension_id, profile_path);
   cmd_line.SetProgram(chrome_exe_path);
   return GetDesktopFileContentsForCommand(cmd_line, app_name, url, title,
-                                          icon_name, no_display);
+                                          icon_name, categories, no_display);
 }
 
 std::string GetDesktopFileContentsForCommand(
     const CommandLine& command_line,
     const std::string& app_name,
     const GURL& url,
     const base::string16& title,
     const std::string& icon_name,
+    const std::string& categories,
     bool no_display) {
   // Although not required by the spec, Nautilus on Ubuntu Karmic creates its
   // launchers with an xdg-open shebang. Follow that convention.
   std::string output_buffer = std::string(kXdgOpenShebang) + "\n";
 
   // See http://standards.freedesktop.org/desktop-entry-spec/latest/
   GKeyFile* key_file = g_key_file_new();
 
   // Set keys with fixed values.
   g_key_file_set_string(key_file, kDesktopEntry, "Version", "1.0");
@@ skipping 17 matching lines @@
   g_key_file_set_string(key_file, kDesktopEntry, "Exec", final_path.c_str());
 
   // Set the "Icon" key.
   if (!icon_name.empty()) {
     g_key_file_set_string(key_file, kDesktopEntry, "Icon", icon_name.c_str());
   } else {
     g_key_file_set_string(key_file, kDesktopEntry, "Icon",
                           GetIconName().c_str());
   }
 
+  // Set the "Categories" key.
+  if (!categories.empty()) {
+    g_key_file_set_string(
+        key_file, kDesktopEntry, "Categories", categories.c_str());
+  }
+
   // Set the "NoDisplay" key.
   if (no_display)
     g_key_file_set_string(key_file, kDesktopEntry, "NoDisplay", "true");
 
   std::string wmclass = web_app::GetWMClassFromAppName(app_name);
   g_key_file_set_string(key_file, kDesktopEntry, "StartupWMClass",
                         wmclass.c_str());
 
   gsize length = 0;
   gchar* data_dump = g_key_file_to_data(key_file, &length, NULL);
@@ skipping 89 matching lines @@
 
   if (creation_locations.on_desktop) {
     std::string contents = ShellIntegrationLinux::GetDesktopFileContents(
         chrome_exe_path,
         app_name,
         shortcut_info.url,
         shortcut_info.extension_id,
         shortcut_info.title,
         icon_name,
         shortcut_info.profile_path,
+        "",
         false);
     success = CreateShortcutOnDesktop(shortcut_filename, contents);
   }
 
   if (creation_locations.applications_menu_location !=
           web_app::APP_MENU_LOCATION_NONE ||
       creation_locations.hidden) {
     base::FilePath directory_filename;
     std::string directory_contents;
     switch (creation_locations.applications_menu_location) {
@@ skipping 12 matching lines @@
     // Set NoDisplay=true if hidden but not in the applications menu. This will
     // hide the application from user-facing menus.
     std::string contents = ShellIntegrationLinux::GetDesktopFileContents(
         chrome_exe_path,
         app_name,
         shortcut_info.url,
         shortcut_info.extension_id,
         shortcut_info.title,
         icon_name,
         shortcut_info.profile_path,
+        "",
         creation_locations.applications_menu_location ==
             web_app::APP_MENU_LOCATION_NONE);
     success = CreateShortcutInApplicationsMenu(
         shortcut_filename, contents, directory_filename, directory_contents) &&
         success;
   }
 
   return success;
 }
 
@@ skipping 18 matching lines @@
   gfx::ImageFamily icon_images;
   ResourceBundle& resource_bundle = ResourceBundle::GetSharedInstance();
   icon_images.Add(*resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_16));
   icon_images.Add(*resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_32));
   icon_images.Add(*resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_48));
   icon_images.Add(*resource_bundle.GetImageSkiaNamed(IDR_APP_LIST_256));
   std::string icon_name = CreateShortcutIcon(icon_images, desktop_name);
 
   CommandLine command_line(chrome_exe_path);
   command_line.AppendSwitch(switches::kShowAppList);
-  std::string contents = GetDesktopFileContentsForCommand(
-      command_line, wm_class, GURL(), base::UTF8ToUTF16(title), icon_name,
-      false);
+  std::string contents =
+      GetDesktopFileContentsForCommand(command_line,
+                                       wm_class,
+                                       GURL(),
+                                       base::UTF8ToUTF16(title),
+                                       icon_name,
+                                       kAppListCategories,
+                                       false);
   return CreateShortcutInApplicationsMenu(
       shortcut_filename, contents, base::FilePath(), "");
 }
 
 void DeleteDesktopShortcuts(const base::FilePath& profile_path,
                             const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   base::FilePath shortcut_filename = GetExtensionShortcutFilename(
       profile_path, extension_id);
@@ skipping 34 matching lines @@
     for (std::vector<base::FilePath>::const_iterator it =
          shortcut_filenames_app_menu.begin();
          it != shortcut_filenames_app_menu.end(); ++it) {
       DeleteShortcutInApplicationsMenu(*it,
                                        base::FilePath(kDirectoryFilename));
     }
   }
 }
 
 }  // namespace ShellIntegrationLinux