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 /app/test_suite.h | |
| 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 'app/test_suite.h')
| -rw-r--r-- | app/test_suite.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/test_suite.h b/app/test_suite.h index 192f80e..8a04be9 100644 --- a/app/test_suite.h +++ b/app/test_suite.h @@ -33,12 +33,24 @@ class AppTestSuite : public TestSuite { app::RegisterPathProvider(); #if defined(OS_MACOSX) + // Look in the framework bundle for resources. + // TODO(port): make a resource bundle for non-app exes. FilePath path; PathService::Get(base::DIR_EXE, &path); - // TODO(port): make a resource bundle for non-app exes. - path = path.AppendASCII("Chromium.app"); - mac_util::SetOverrideAppBundlePath(path); +#if defined(GOOGLE_CHROME_BUILD) +#define MAC_PRODUCT_NAME "Google Chrome" +#elif defined(CHROMIUM_BUILD) +#define MAC_PRODUCT_NAME "Chromium" +#else +#error Unknown branding #endif + path = path.AppendASCII(MAC_PRODUCT_NAME ".app"); + path = path.AppendASCII("Contents"); + path = path.AppendASCII("Frameworks"); + path = path.AppendASCII(MAC_PRODUCT_NAME " Framework.framework"); +#undef MAC_PRODUCT_NAME + mac_util::SetOverrideAppBundlePath(path); +#endif // OS_MACOSX // Force unittests to run using en-US so if we test against string // output, it'll pass regardless of the system language. |