Deduplicate Monochrome locale .paks

chrome/app/chrome_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/app/chrome_main_delegate.h"
 
 #include <stddef.h>
 #include <string>
 
 #include "base/base_paths.h"
@@ skipping 870 matching lines @@
       kAndroidChrome100PercentPakDescriptor,
       kAndroidUIResourcesPakDescriptor,
     };
     for (size_t i = 0; i < arraysize(extra_pak_keys); ++i) {
       pak_fd = global_descriptors->Get(extra_pak_keys[i]);
       pak_region = global_descriptors->GetRegion(extra_pak_keys[i]);
       ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
           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 line ~879? So the code loads the
secondary locale pack right after the primary?

[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
     ui::MaterialDesignController::Initialize();
     const std::string loaded_locale =
         ui::ResourceBundle::InitSharedInstanceWithLocale(
             locale, NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
 
     base::FilePath resources_pack_path;
     PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);
@@ skipping 321 matching lines @@
 
 std::unique_ptr<service_manager::Service>
 ChromeMainDelegate::CreateEmbeddedService(const std::string& service_name) {
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   auto mash_service = CreateEmbeddedMashService(service_name);
   if (mash_service)
     return mash_service;
 #endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
   return nullptr;
 }