| Index: ui/base/resource/resource_bundle_mac.mm
|
| diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
|
| index fd9a2cbfdf1ab954ba1e8b7ae4e20ffe7abb4e54..39c52d9df9a655856e2ce12f4ab70dc87558a909 100644
|
| --- a/ui/base/resource/resource_bundle_mac.mm
|
| +++ b/ui/base/resource/resource_bundle_mac.mm
|
| @@ -22,7 +22,7 @@ namespace ui {
|
|
|
| namespace {
|
|
|
| -FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
|
| +base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
|
| NSString *resource_path;
|
| // Some of the helper processes need to be able to fetch resources
|
| // (chrome_main.cc: SubprocessNeedsResourceBundle()). Fetch the same locale
|
| @@ -66,8 +66,8 @@ void ResourceBundle::LoadCommonResources() {
|
| }
|
| }
|
|
|
| -FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
|
| - bool test_file_exists) {
|
| +base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
|
| + bool test_file_exists) {
|
| NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
|
|
|
| // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
|
|
|