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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 2977993002: Reland of Deduplicate Monochrome locale .paks (Closed)
Patch Set: Created 3 years, 5 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
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/browser/chrome_browser_main_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..0371d5148891b30dadaa952b3020ea0b62b9c513 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -877,6 +877,16 @@ void ChromeMainDelegate::PreSandboxStartup() {
ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
pak_region);
+ // 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);
+ }
+
int extra_pak_keys[] = {
kAndroidChrome100PercentPakDescriptor,
kAndroidUIResourcesPakDescriptor,
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/browser/chrome_browser_main_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698