Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.
Re-commit, reverted in http://crrev.com/157680 (original commit in http://crrev.com/157667).
This allows usage of PathService to cache the shortcut install paths and more importantly to mock them in shortcut tests!
Also move chrome::DIR_USER_DESKTOP to base::DIR_USER_DESKTOP; this is really where it belongs. In fact it is only in chrome_paths.h because it used to be called DIR_DEFAULT_DOWNLOAD and cpu@ renamed it to DIR_USER_DESKTOP in http://crrev.com/1753 (early days!) after that it started to be used all over the place as the Desktop path. Finally bringing it to base_paths.h, beside DIR_START_MENU and friends, is the right thing to do imo.
TBR=brettw@chromium.org
BUG=148539
TEST=Quick Launch shortcut installed in the right place on XP (both Default and current user)
Desktop shortcuts installed in the right place (both All Users and per-user installs).
installer_util_unittests.exe --gtest_filter=ShellUtilShortcutTest*
unit_tests.exe --gtest_filter=ProfileShortcutManagerTest*
base_unittests --gtest_filter=PathServiceTest*
Review URL: https://chromiumcodereview.appspot.com/10964007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157779 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: dea1d7d21976d078a41b2d321e8d626379c7a1fd
diff --git a/base/path_service.cc b/base/path_service.cc
index a3b882c..7a696e9 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -26,6 +26,8 @@
#elif defined(OS_ANDROID)
bool PathProviderAndroid(int key, FilePath* result);
#elif defined(OS_POSIX)
+ // PathProviderPosix is the default path provider on POSIX OSes other than
+ // Mac and Android.
bool PathProviderPosix(int key, FilePath* result);
#endif
}
@@ -85,8 +87,8 @@
base::PathProviderAndroid,
&base_provider,
#ifndef NDEBUG
- 0,
- 0,
+ base::PATH_ANDROID_START,
+ base::PATH_ANDROID_END,
#endif
true
};
@@ -97,8 +99,8 @@
base::PathProviderPosix,
&base_provider,
#ifndef NDEBUG
- 0,
- 0,
+ base::PATH_POSIX_START,
+ base::PATH_POSIX_END,
#endif
true
};