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

base/base_paths.h

Index: base/base_paths.h
diff --git a/base/base_paths.h b/base/base_paths.h
index 39edd164c38fbeb45a3579ab189d15df54f34de7..3251a84c6ba9c4d8934d8525e3451c83bb1f5fab 100644
--- a/base/base_paths.h
+++ b/base/base_paths.h
@@ -18,6 +18,10 @@
 #include "base/base_paths_android.h"
 #endif
 
+#if defined(OS_POSIX)
+#include "base/base_paths_posix.h"
+#endif
+
 namespace base {
 
 enum BasePathKey {
@@ -34,17 +38,7 @@ enum BasePathKey {
   DIR_SOURCE_ROOT,  // Returns the root of the source tree.  This key is useful
                     // for tests that need to locate various resources.  It
                     // should not be used outside of test code.
-#if defined(OS_POSIX)
-  DIR_CACHE,    // Directory where to put cache data.  Note this is
-                // *not* where the browser cache lives, but the
-                // browser cache can be a subdirectory.
-                // This is $XDG_CACHE_HOME on Linux and
-                // ~/Library/Caches on Mac.
-  DIR_HOME,     // $HOME on POSIX-like systems.
-#endif
-#if defined(OS_ANDROID)
-  DIR_ANDROID_EXTERNAL_STORAGE,  // Android external storage directory.
-#endif
+  DIR_USER_DESKTOP,  // The current user's Desktop.
 
   PATH_END
 };