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 /chrome/browser/cocoa | |
| 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 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/cocoa_test_helper.h | 7 | ||||
| -rw-r--r-- | chrome/browser/cocoa/nsimage_cache_unittest.mm | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/chrome/browser/cocoa/cocoa_test_helper.h b/chrome/browser/cocoa/cocoa_test_helper.h index 8eb3438..1627391 100644 --- a/chrome/browser/cocoa/cocoa_test_helper.h +++ b/chrome/browser/cocoa/cocoa_test_helper.h @@ -12,7 +12,7 @@ #include "base/mac_util.h" #include "base/path_service.h" #import "base/scoped_nsobject.h" -#include "chrome/common/mac_app_names.h" +#include "chrome/common/chrome_constants.h" // Background windows normally will not display things such as focus // rings. This class allows -isKeyWindow to be manipulated to test @@ -58,10 +58,7 @@ class CocoaNoWindowTestHelper { // 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); + path = path.Append(chrome::kFrameworkName); 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 6283ffe..03d1b5e 100644 --- a/chrome/browser/cocoa/nsimage_cache_unittest.mm +++ b/chrome/browser/cocoa/nsimage_cache_unittest.mm @@ -8,7 +8,7 @@ #include "base/mac_util.h" #include "base/nsimage_cache_mac.h" #include "base/path_service.h" -#include "chrome/common/mac_app_names.h" +#include "chrome/common/chrome_constants.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -23,10 +23,7 @@ class NSImageCacheTest : public PlatformTest { // 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); + path = path.Append(chrome::kFrameworkName); mac_util::SetOverrideAppBundlePath(path); } virtual ~NSImageCacheTest() { |