diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 16:42:16 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-07 16:42:16 +0000 |
| commit | e4221ad535d561b931bd900db9278825adf36b06 (patch) | |
| tree | 5ca7bef32977d76773f975d13a34c11dd86eab04 /chrome/common/chrome_paths.cc | |
| parent | 9997409a1d70d0f44936ce49227520406b543c6d (diff) | |
| download | chromium_src-e4221ad535d561b931bd900db9278825adf36b06.zip chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.gz chromium_src-e4221ad535d561b931bd900db9278825adf36b06.tar.bz2 | |
Move all resources into the framework.
BUG=14610 (in support of unbreaking auto-update)
TEST=The .app's Contents/Resources folder should not contain the resources that
are moving to the .framework's Resources folder;
The .app's Contents/Resources folder should still contain app.icns,
document.icns, the helper .app, and a whole slew of .lprojs that only
contain InfoPlist.strings;
Make sure Breakpad still works in the browser, renderer, and other process
types.
Review URL: http://codereview.chromium.org/256062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/chrome_paths.cc')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 8612e68..aa9ae8d 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -115,16 +115,15 @@ bool PathProvider(int key, FilePath* result) { return false; break; case chrome::DIR_INSPECTOR: - if (!PathService::Get(chrome::DIR_APP, &cur)) - return false; #if defined(OS_MACOSX) - cur = cur.DirName(); + cur = mac_util::MainAppBundlePath(); cur = cur.Append(FILE_PATH_LITERAL("Resources")); - cur = cur.Append(FILE_PATH_LITERAL("inspector")); #else + if (!PathService::Get(chrome::DIR_APP, &cur)) + return false; cur = cur.Append(FILE_PATH_LITERAL("resources")); - cur = cur.Append(FILE_PATH_LITERAL("inspector")); #endif + cur = cur.Append(FILE_PATH_LITERAL("inspector")); break; case chrome::DIR_APP_DICTIONARIES: #if defined(OS_LINUX) || defined(OS_MACOSX) |