From 560541ea404af23c1e91f0ef83b4ed11022a84c7 Mon Sep 17 00:00:00 2001 From: "finnur@chromium.org" Date: Tue, 16 Jun 2009 23:11:26 +0000 Subject: Bug 14202: Support relative paths when installing external extensions through prefs. First we try the path as absolute path. If the file is not found, we try a relative path: [installation path]\extensions This will make installing extensions easier from pre-installed prefs, since we can drop them into an extensions directory under the program directory. BUG=14202 TEST=Specify relative path when installing extensions through prefs. Best to test this with an installer that supports deploying extensions (blocked on 14201) Review URL: http://codereview.chromium.org/125219 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18554 0039d316-1c4b-4281-b951-d872f2087c98 --- app/app_paths.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'app/app_paths.h') diff --git a/app/app_paths.h b/app/app_paths.h index 36ae9b6..3f97feb 100644 --- a/app/app_paths.h +++ b/app/app_paths.h @@ -2,8 +2,8 @@ // source code is governed by a BSD-style license that can be found in the // LICENSE file. -#ifndef APP_APP_PATHS_ -#define APP_APP_PATHS_ +#ifndef APP_APP_PATHS_H_ +#define APP_APP_PATHS_H_ // This file declares path keys for the app module. These can be used with // the PathService to access various special directories and files. @@ -13,11 +13,12 @@ namespace app { enum { PATH_START = 2000, - DIR_THEMES, // directory where theme dll files are stored - DIR_LOCALES, // directory where locale resources are stored + DIR_THEMES, // Directory where theme dll files are stored. + DIR_LOCALES, // Directory where locale resources are stored. + DIR_EXTERNAL_EXTENSIONS, // Directory where installer places .crx files. // Valid only in development environment; TODO(darin): move these - DIR_TEST_DATA, // directory where unit test data resides + DIR_TEST_DATA, // Directory where unit test data resides. PATH_END }; @@ -27,4 +28,4 @@ void RegisterPathProvider(); } // namespace app -#endif // #ifndef APP_APP_PATHS_ +#endif // APP_APP_PATHS_H_ -- cgit v1.1