diff options
author | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-19 17:13:09 +0200 |
---|---|---|
committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-19 17:38:32 +0200 |
commit | ae2568aa885ee57138100e4e9c30cbba9f98d3fa (patch) | |
tree | c432ee7ea5b11d17e3b826e6761740eb4f59e7b6 /lib | |
parent | c8c6be89630242f220263f3a0633dd493dec0ce6 (diff) |
[Mac] Buildfix: reintroduce ResourceBundle::GetLocaleFilePath.
As this function is excluded using a !defined(OS_MACOSX) in
resource_bundle.cc, we have to add a replacement for it in
resource_bundle_qt.cpp using the inverted logic.
Change-Id: I9b19977c61113280d2af75ba51a5466ecfc0e033
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/resource_bundle_qt.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/resource_bundle_qt.cpp b/lib/resource_bundle_qt.cpp index d776946ee..5fb62370f 100644 --- a/lib/resource_bundle_qt.cpp +++ b/lib/resource_bundle_qt.cpp @@ -144,6 +144,15 @@ void ResourceBundle::LoadCommonResources() AddDataPack(data_pack.release()); } +// As GetLocaleFilePath is excluded for Mac in resource_bundle.cc, +// we have to add a replacement for it using the inverted logic. +#if defined(OS_MACOSX) +base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& /*app_locale*/, bool /*test_file_exists*/) +{ + return base::FilePath(); +} +#endif + gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) { LOG(WARNING) << "Unable to load image with id " << resource_id; |