diff options
| author | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 18:28:50 +0000 |
|---|---|---|
| committer | caitkp@chromium.org <caitkp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-12 18:28:50 +0000 |
| commit | 333b1de96adffbde36931f68a0ee9f099d9dd8f3 (patch) | |
| tree | a579277f2e08121bd441466beaffdc825d0937b4 /chrome/common | |
| parent | 78f7350ed13da5d6211acc91778978f4930338f6 (diff) | |
| download | chromium_src-333b1de96adffbde36931f68a0ee9f099d9dd8f3.zip chromium_src-333b1de96adffbde36931f68a0ee9f099d9dd8f3.tar.gz chromium_src-333b1de96adffbde36931f68a0ee9f099d9dd8f3.tar.bz2 | |
Moved from http://codereview.chromium.org/7811020/ (same CL but was on a read-only check-out)
BUG=94920
-Related:
Check in a new CRX:
http://codereview.chromium.org/7828014/
Check in a few GYP changes:
http://codereview.chromium.org/7827021/
-Modified profile_impl to search for and auto-install apps found in DIR_DEFAULT_APPS when profile created
-Added tracking code for number of extension installs and uninstalls and number of webstore visits.
Review URL: http://codereview.chromium.org/7839009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100727 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 10 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 7f223cf..db1f2b5 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -353,6 +353,16 @@ bool PathProvider(int key, FilePath* result) { create_dir = true; #endif break; + case chrome::DIR_DEFAULT_APPS: +#if defined(OS_MACOSX) + cur = base::mac::MainAppBundlePath(); + cur = cur.Append(FILE_PATH_LITERAL("Default Apps")); +#else + if (!PathService::Get(chrome::DIR_APP, &cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("default_apps")); +#endif + break; default: return false; } diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 4b89a4e..78ca6b1 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -57,6 +57,8 @@ enum { #endif DIR_EXTERNAL_EXTENSIONS, // Directory where installer places .crx files. + DIR_DEFAULT_APPS, // Directory where installer places .crx files + // to be installed when chrome is first run. FILE_RESOURCE_MODULE, // Full path and filename of the module that // contains embedded resources (version, // strings, images, etc.). |