More reliably find the .desktop file for the browser.

chrome/browser/shell_integration_linux.cc

 // Copyright (c) 2006-2009 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 <fcntl.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 59 matching lines @@
     return false;
   }
   close(devnull);
 
   int success_code;
   base::WaitForExitCode(handle, &success_code);
   return success_code == EXIT_SUCCESS;
 }
 
 bool GetDesktopShortcutTemplate(std::string* output) {
-  std::vector<std::string> search_paths;
+  std::vector<FilePath> search_paths;
 
   const char* xdg_data_home = getenv("XDG_DATA_HOME");
   if (xdg_data_home)
-    search_paths.push_back(xdg_data_home);
+    search_paths.push_back(FilePath(xdg_data_home));
 
   const char* xdg_data_dirs = getenv("XDG_DATA_DIRS");
   if (xdg_data_dirs) {
     CStringTokenizer tokenizer(xdg_data_dirs,
                                xdg_data_dirs + strlen(xdg_data_dirs), ":");
     while (tokenizer.GetNext()) {
-      search_paths.push_back(tokenizer.token());
+      FilePath data_dir(tokenizer.token());
+      search_paths.push_back(data_dir);
+      search_paths.push_back(data_dir.Append("applications"));

[Mike Mammarella, 2009/09/17 17:23:53]

Technically the string constant should be wrapped in FILE_PATH_LITERAL, but this
file is only for Linux where that does nothing anyway.

     }
   }
 
   std::string template_filename(GetDesktopName());
-  for (std::vector<std::string>::const_iterator i = search_paths.begin();
+  for (std::vector<FilePath>::const_iterator i = search_paths.begin();
        i != search_paths.end(); ++i) {
-    FilePath path = FilePath(*i).Append(template_filename);
+    FilePath path = (*i).Append(template_filename);
     if (file_util::PathExists(path))
       return file_util::ReadFileToString(path, output);
   }
 
   return false;
 }
 
 class CreateDesktopShortcutTask : public Task {
  public:
   CreateDesktopShortcutTask(const ShellIntegration::ShortcutInfo& shortcut_info)
@@ skipping 151 matching lines @@
     }
   }
   return output_buffer;
 }
 
 void ShellIntegration::CreateDesktopShortcut(
     const ShortcutInfo& shortcut_info) {
   g_browser_process->file_thread()->message_loop()->PostTask(FROM_HERE,
       new CreateDesktopShortcutTask(shortcut_info));
 }