Re-commit: Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.

chrome/common/chrome_paths_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/common/chrome_paths_internal.h"
 
 #include "base/environment.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/nix/xdg_util.h"
@@ skipping 19 matching lines @@
                            FilePath* result) {
 #if defined(OS_CHROMEOS)
   // No local media directories on CrOS.
   return false;
 #else
   *result = GetXDGUserDirectory(xdg_name.c_str(), fallback_name.c_str());
 
   FilePath home = file_util::GetHomeDir();
   if (*result != home) {
     FilePath desktop;
-    GetUserDesktop(&desktop);
+    if (!PathService::Get(base::DIR_USER_DESKTOP, &desktop))
+      return false;
     if (*result != desktop) {
       return true;
     }
   }
 
   *result = home.Append(fallback_name);
   return true;
 #endif
 }
 
@@ skipping 84 matching lines @@
 bool GetUserPicturesDirectory(FilePath* result) {
   return GetUserMediaDirectory("PICTURES", kPicturesDir, result);
 }
 
 // We respect the user's preferred pictures location, unless it is
 // ~ or their desktop directory, in which case we default to ~/Videos.
 bool GetUserVideosDirectory(FilePath* result) {
   return GetUserMediaDirectory("VIDEOS", kVideosDir, result);
 }
 
-bool GetUserDesktop(FilePath* result) {
-  *result = GetXDGUserDirectory("DESKTOP", "Desktop");
-  return true;
-}
-
 bool ProcessNeedsProfileDir(const std::string& process_type) {
   // For now we have no reason to forbid this on Linux as we don't
   // have the roaming profile troubles there. Moreover the Linux breakpad needs
   // profile dir access in all process if enabled on Linux.
   return true;
 }
 
 }  // namespace chrome