Chromium Code Reviews| Index: chrome/app/chrome_main_delegate.cc |
| diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
| index c382e538c192aacddd85db989c2be70367e80152..08882fd955c41134d4752191b8cb9ba7fb8d9d4c 100644 |
| --- a/chrome/app/chrome_main_delegate.cc |
| +++ b/chrome/app/chrome_main_delegate.cc |
| @@ -888,6 +888,16 @@ void ChromeMainDelegate::PreSandboxStartup() { |
| base::File(pak_fd), pak_region, ui::SCALE_FACTOR_100P); |
| } |
| + // Load secondary locale .pak file if it exists. |
|
Lei Zhang
2017/06/29 19:08:31
Do you want to move the newly added code up to lin
F
2017/06/29 19:20:03
Done.
|
| + pak_fd = global_descriptors->MaybeGet(kAndroidSecondaryLocalePakDescriptor); |
| + if (pak_fd != -1) { |
| + pak_region = global_descriptors->GetRegion( |
| + kAndroidSecondaryLocalePakDescriptor); |
| + ResourceBundle::GetSharedInstance(). |
| + LoadSecondaryLocaleDataWithPakFileRegion( |
| + base::File(pak_fd), pak_region); |
| + } |
| + |
| base::i18n::SetICUDefaultLocale(locale); |
| const std::string loaded_locale = locale; |
| #else |