| Index: ui/base/l10n/l10n_util.cc
|
| ===================================================================
|
| --- ui/base/l10n/l10n_util.cc (revision 135347)
|
| +++ ui/base/l10n/l10n_util.cc (working copy)
|
| @@ -240,7 +240,7 @@
|
| if (!l10n_util::IsLocaleSupportedByOS(locale))
|
| return false;
|
|
|
| - return ResourceBundle::LocaleDataPakExists(locale);
|
| + return ResourceBundle::GetSharedInstance().LocaleDataPakExists(locale);
|
| }
|
|
|
| bool CheckAndResolveLocale(const std::string& locale,
|
| @@ -446,9 +446,6 @@
|
| return fallback_locale;
|
| }
|
|
|
| - // No locale data file was found; we shouldn't get here.
|
| - NOTREACHED();
|
| -
|
| return std::string();
|
|
|
| #endif
|
|
|