diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 20:03:54 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 20:03:54 +0000 |
| commit | 6a271dbaace85b14f566eba159b620de2172913f (patch) | |
| tree | 6e2331da6d7e5b004383dd3ffaab6132b4e19087 /app | |
| parent | d9fde8deca892d79f064746e322cf6270d289a18 (diff) | |
| download | chromium_src-6a271dbaace85b14f566eba159b620de2172913f.zip chromium_src-6a271dbaace85b14f566eba159b620de2172913f.tar.gz chromium_src-6a271dbaace85b14f566eba159b620de2172913f.tar.bz2 | |
Get rid of mac_app_names.h. Replace it with real constants from
chrome_constants.h.
As a side effect of this change, tests will use the framework in the build
directory as their main bundle override for the purposes of resource loading,
instead of looking into the framework inside the application bundle. This
should be more than sufficient, and is done for simplicity, because a future
change will make it more difficult to locate the correct framework inside the
application bundle unless the product version number is known.
BUG=24220
TEST=product still works and all tests still pass
Review URL: http://codereview.chromium.org/266023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28431 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/test_suite.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/app/test_suite.h b/app/test_suite.h index 8a04be9..8cb6ee1 100644 --- a/app/test_suite.h +++ b/app/test_suite.h @@ -34,21 +34,18 @@ class AppTestSuite : public TestSuite { #if defined(OS_MACOSX) // Look in the framework bundle for resources. - // TODO(port): make a resource bundle for non-app exes. + // TODO(port): make a resource bundle for non-app exes. What's done here + // isn't really right because this code needs to depend on chrome_dll + // being built. This is inappropriate in app. FilePath path; PathService::Get(base::DIR_EXE, &path); #if defined(GOOGLE_CHROME_BUILD) -#define MAC_PRODUCT_NAME "Google Chrome" + path = path.AppendASCII("Google Chrome Framework.framework"); #elif defined(CHROMIUM_BUILD) -#define MAC_PRODUCT_NAME "Chromium" + path = path.AppendASCII("Chromium Framework.framework"); #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 |