diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 01:59:36 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-20 01:59:36 +0000 |
| commit | 1f4ae1659132f11a99e4425efdc517838e21b7ae (patch) | |
| tree | d5839b4906f43c1dff10e96f6eaa453d4334f0ae /base/base_paths.h | |
| parent | 5e63aededfd66dd694e68619051153439f0016b1 (diff) | |
| download | chromium_src-1f4ae1659132f11a99e4425efdc517838e21b7ae.zip chromium_src-1f4ae1659132f11a99e4425efdc517838e21b7ae.tar.gz chromium_src-1f4ae1659132f11a99e4425efdc517838e21b7ae.tar.bz2 | |
Revert 157667 - Add new PathService paths for Windows' All Users Desktop and Quick Launch folders.
The previous patch failed PathServiceTest.Get.
This allows usage of PathService to cache the 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.
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/10910209
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/10958009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base_paths.h')
| -rw-r--r-- | base/base_paths.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/base/base_paths.h b/base/base_paths.h index 3251a84..39edd16 100644 --- a/base/base_paths.h +++ b/base/base_paths.h @@ -18,10 +18,6 @@ #include "base/base_paths_android.h" #endif -#if defined(OS_POSIX) -#include "base/base_paths_posix.h" -#endif - namespace base { enum BasePathKey { @@ -38,7 +34,17 @@ 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. - DIR_USER_DESKTOP, // The current user's Desktop. +#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 PATH_END }; |