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/browser/cocoa | |
| 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/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/cocoa_test_helper.h | 5 | ||||
| -rw-r--r-- | chrome/browser/cocoa/nsimage_cache_unittest.mm | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/cocoa/cocoa_test_helper.h b/chrome/browser/cocoa/cocoa_test_helper.h index 282db9c..ebcb4d4 100644 --- a/chrome/browser/cocoa/cocoa_test_helper.h +++ b/chrome/browser/cocoa/cocoa_test_helper.h @@ -50,10 +50,13 @@ class CocoaTestHelper { public: CocoaTestHelper() { - // Look in the Chromium app bundle for resources. + // Look in the framework bundle for resources. FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.AppendASCII(MAC_BROWSER_APP_NAME); + path = path.AppendASCII("Contents"); + path = path.AppendASCII("Frameworks"); + path = path.AppendASCII(MAC_FRAMEWORK_NAME); mac_util::SetOverrideAppBundlePath(path); // Bootstrap Cocoa. It's very unhappy without this. diff --git a/chrome/browser/cocoa/nsimage_cache_unittest.mm b/chrome/browser/cocoa/nsimage_cache_unittest.mm index 9ecf747..6283ffe 100644 --- a/chrome/browser/cocoa/nsimage_cache_unittest.mm +++ b/chrome/browser/cocoa/nsimage_cache_unittest.mm @@ -20,10 +20,13 @@ namespace { class NSImageCacheTest : public PlatformTest { public: NSImageCacheTest() { - // Look in the Chromium app bundle for resources. + // Look in the framework bundle for resources. FilePath path; PathService::Get(base::DIR_EXE, &path); path = path.AppendASCII(MAC_BROWSER_APP_NAME); + path = path.AppendASCII("Contents"); + path = path.AppendASCII("Frameworks"); + path = path.AppendASCII(MAC_FRAMEWORK_NAME); mac_util::SetOverrideAppBundlePath(path); } virtual ~NSImageCacheTest() { |