Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.

base/base_paths_win.cc

Index: base/base_paths_win.cc
diff --git a/base/base_paths_win.cc b/base/base_paths_win.cc
index 48238a4ffc2aff1c3554953d494568d7b1010b50..ae954aae3814caa3e023465706483ec8284aff01 100644
--- a/base/base_paths_win.cc
+++ b/base/base_paths_win.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/base_paths_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
+#include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -16,6 +16,37 @@
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
+namespace {
+
+bool GetQuickLaunchPath(bool default_user, FilePath* result) {
+  if (default_user) {
+    wchar_t system_buffer[MAX_PATH];
+    system_buffer[0] = 0;
+    // As per MSDN (http://goo.gl/U8Wcp) passing -1 for |hToken| indicates the

[grt (UTC plus 2), 2012/09/19 16:44:46]

re goo.gl: i'm not a fan of shortened urls here since it adds a dependency on
the shortener.  please use the msdn url directly here and elsewhere.

[gab, 2012/09/19 18:22:58]

Done.

+    // Default user.
+    if (FAILED(SHGetFolderPath(NULL, CSIDL_APPDATA,
+                               reinterpret_cast<HANDLE>(-1), SHGFP_TYPE_CURRENT,
+                               system_buffer))) {
+      return false;
+    }
+    *result = FilePath(system_buffer);
+  } else if (!PathService::Get(base::DIR_APP_DATA, result)) {
+    // For the current user, grab the APPDATA directory directly from the
+    // PathService cache.
+    return false;
+  }
+  // According to various sources (http://goo.gl/3MFtg and http://goo.gl/GxLRL):
+  // appending "Microsoft\Internet Explorer\Quick Launch" to %appdata% is the
+  // only reliable way to get the quick launch folder across all versions of
+  // Windows.
+  *result = result->AppendASCII("Microsoft");
+  *result = result->AppendASCII("Internet Explorer");
+  *result = result->AppendASCII("Quick Launch");
+  return true;
+}
+
+}  // namespace
+
 namespace base {
 
 bool PathProviderWin(int key, FilePath* result) {
@@ -138,6 +169,32 @@ bool PathProviderWin(int key, FilePath* result) {
       cur = FilePath(string16(path_buf));
       break;
     }
+    case base::DIR_USER_DESKTOP: {

[grt (UTC plus 2), 2012/09/19 16:44:46]

nit: only use braces when necessary

[gab, 2012/09/19 18:22:58]

Done.

+      if (FAILED(SHGetFolderPath(NULL, CSIDL_DESKTOPDIRECTORY, NULL,
+                                 SHGFP_TYPE_CURRENT, system_buffer))) {
+        return false;
+      }
+      cur = FilePath(system_buffer);
+      break;
+    }
+    case base::DIR_COMMON_DESKTOP: {
+      if (FAILED(SHGetFolderPath(NULL, CSIDL_COMMON_DESKTOPDIRECTORY, NULL,
+                                 SHGFP_TYPE_CURRENT, system_buffer))) {
+        return false;
+      }
+      cur = FilePath(system_buffer);
+      break;
+    }
+    case base::DIR_USER_QUICK_LAUNCH: {
+      if (!GetQuickLaunchPath(false, &cur))
+        return false;
+      break;
+    }
+    case base::DIR_DEFAULT_USER_QUICK_LAUNCH: {
+      if (!GetQuickLaunchPath(true, &cur))
+        return false;
+      break;
+    }
     default:
       return false;
   }