diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 01:40:34 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 01:40:34 +0000 |
| commit | ffc4b62628439516ee0114287b35300f8d3d8794 (patch) | |
| tree | 2662c8585ef0bfa2f9e57a6537484ed451f769f4 /chrome/tools/mac_helpers | |
| parent | eedce1c2fbcbe45bf3dd1f9b2951f2d1158e1e03 (diff) | |
| download | chromium_src-ffc4b62628439516ee0114287b35300f8d3d8794.zip chromium_src-ffc4b62628439516ee0114287b35300f8d3d8794.tar.gz chromium_src-ffc4b62628439516ee0114287b35300f8d3d8794.tar.bz2 | |
Fix the tree
Possibly the change of
http://src.chromium.org/viewvc/chrome?view=rev&revision=175642
Broke the mac plist string generation
BUG=168890
TEST=mac bot not red
TBR=thakis
Review URL: https://codereview.chromium.org/11829014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools/mac_helpers')
| -rw-r--r-- | chrome/tools/mac_helpers/infoplist_strings_util.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm index 508c5b7..e75c147 100644 --- a/chrome/tools/mac_helpers/infoplist_strings_util.mm +++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm @@ -12,6 +12,7 @@ #include <unistd.h> #include "base/file_path.h" +#include "base/file_util.h" #include "base/mac/scoped_nsautorelease_pool.h" #include "base/memory/scoped_ptr.h" #include "base/string_piece.h" @@ -60,6 +61,7 @@ ui::DataPack* LoadResourceDataPack(const char* dir_path, dir_path, branding_strings_name, locale_name]; if (resource_path) { FilePath resources_pak_path([resource_path fileSystemRepresentation]); + file_util::AbsolutePath(&resources_pak_path); resource_pack = new ui::DataPack(ui::SCALE_FACTOR_100P); bool success = resource_pack->LoadFromPath(resources_pak_path); if (!success) { |