diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 14:59:07 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-19 14:59:07 +0000 |
| commit | 2f1804c7ecc4b4c8bb802dc518db9f3244b57e15 (patch) | |
| tree | 64584fe049e7b0381f142689eb934dae9eac8ad3 /webkit | |
| parent | e8315a4dca1a46363b91af21742bdb5d0eb0ceeb (diff) | |
| download | chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.zip chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.gz chromium_src-2f1804c7ecc4b4c8bb802dc518db9f3244b57e15.tar.bz2 | |
Transition to base/mac/bundle_locations.h step 2
Remove MainAppBundle() in favor of FrameworkBundle() and update all callsites + code comments.
BUG=None
TEST=Code should compile and all unit tests should pass.
Review URL: https://chromiumcodereview.appspot.com/9220005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/support/platform_support_mac.mm | 5 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_mac.mm | 7 |
2 files changed, 7 insertions, 5 deletions
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm index 9b40c16..cc6fedf 100644 --- a/webkit/support/platform_support_mac.mm +++ b/webkit/support/platform_support_mac.mm @@ -11,6 +11,7 @@ #include "base/base_paths.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/mac/bundle_locations.h" #include "base/mac/mac_util.h" #include "base/path_service.h" #include "base/string16.h" @@ -106,8 +107,8 @@ void AfterInitialize(bool unit_test_mode) { // Load a data pack. g_resource_data_pack = new ui::DataPack; NSString* resource_path = - [base::mac::MainAppBundle() pathForResource:@"DumpRenderTree" - ofType:@"pak"]; + [base::mac::FrameworkBundle() pathForResource:@"DumpRenderTree" + ofType:@"pak"]; FilePath resources_pak_path([resource_path fileSystemRepresentation]); if (!g_resource_data_pack->Load(resources_pak_path)) { LOG(FATAL) << "failed to load DumpRenderTree.pak"; diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm index 2aa62b0..835ff4f 100644 --- a/webkit/tools/test_shell/test_shell_mac.mm +++ b/webkit/tools/test_shell/test_shell_mac.mm @@ -15,6 +15,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" +#include "base/mac/bundle_locations.h" #include "base/mac/cocoa_protocols.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" @@ -213,8 +214,8 @@ void TestShell::InitializeTestShell(bool layout_test_mode, // tests. This is a harmless failure for test_shell_tests. g_resource_data_pack = new ui::DataPack; NSString *resource_path = - [base::mac::MainAppBundle() pathForResource:@"test_shell" - ofType:@"pak"]; + [base::mac::FrameworkBundle() pathForResource:@"test_shell" + ofType:@"pak"]; FilePath resources_pak_path([resource_path fileSystemRepresentation]); if (!g_resource_data_pack->Load(resources_pak_path)) { LOG(FATAL) << "failed to load test_shell.pak"; @@ -224,7 +225,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode, // Load the Ahem font, which is used by layout tests. const char* ahem_path_c; - NSString* ahem_path = [[base::mac::MainAppBundle() resourcePath] + NSString* ahem_path = [[base::mac::FrameworkBundle() resourcePath] stringByAppendingPathComponent:@"AHEM____.TTF"]; ahem_path_c = [ahem_path fileSystemRepresentation]; FSRef ahem_fsref; |