Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4542)

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 2933343002: Deduplicate Monochrome locale .paks (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.
+ 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

Powered by Google App Engine
This is Rietveld 408576698