diff options
author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 15:51:57 +0000 |
---|---|---|
committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-14 15:51:57 +0000 |
commit | 41cd00a4e364aad2b9a53964684e554aa3b675e8 (patch) | |
tree | 65c85ff828574d1c06a0a66a4a6dd5c8dfcf447f /chrome/common/chrome_paths_internal.h | |
parent | 2b42f3d1a6ed5ba99f5b6f4ca907051040664f47 (diff) | |
download | chromium_src-41cd00a4e364aad2b9a53964684e554aa3b675e8.zip chromium_src-41cd00a4e364aad2b9a53964684e554aa3b675e8.tar.gz chromium_src-41cd00a4e364aad2b9a53964684e554aa3b675e8.tar.bz2 |
Move the framework and helper application into a versioned directory in support
of unbreaking auto-update.
BUG=14610
TEST= - The following bundles should be gone:
- Chromium.app/Contents/Frameworks/Chromium Framework.framework
- Chromium.app/Contents/Resources/Chromium Helper.app
They should be replaced by:
- Chromium.app/Contents/Versions/*/Chromium Framework.framework
- Chromium.app/Contents/Versions/*/Chromium Helper.app
- The application should continue to function properly and all tests
should still pass.
- The signed application should have the inner framework and helper
application signed, and the outer application signed. The outer seal
should permit unknown versions to be present in the Versions directory,
but should protect the active versioned directory.
- Auto-updating to an official build with this change should still work.
Review URL: http://codereview.chromium.org/261031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28963 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths_internal.h')
-rw-r--r-- | chrome/common/chrome_paths_internal.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths_internal.h b/chrome/common/chrome_paths_internal.h index 38d4dc8..dfaded7 100644 --- a/chrome/common/chrome_paths_internal.h +++ b/chrome/common/chrome_paths_internal.h @@ -38,6 +38,17 @@ bool GetUserDownloadsDirectory(FilePath* result); bool GetUserDesktop(FilePath* result); #if defined(OS_MACOSX) +// The "versioned directory" is a directory in the browser .app bundle. It +// contains the bulk of the application, except for the things that the system +// requires be located at spepcific locations. The versioned directory is +// in the .app at Contents/Versions/w.x.y.z. +FilePath GetVersionedDirectory(); + +// Most of the application is further contained within the framework. The +// framework bundle is located within the versioned directory at a specific +// path. The only components in the versioned directory not included in the +// framework are things that also depend on the framework, such as the helper +// app bundle. FilePath GetFrameworkBundlePath(); #endif // OS_MACOSX |