Convert Android WebView to store locale .pak files as res/raw resources

android_webview/browser/aw_browser_main_parts.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 "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_dev_tools_discovery_provider.h"
 #include "android_webview/browser/aw_media_client_android.h"
 #include "android_webview/browser/aw_result_codes.h"
 #include "android_webview/common/aw_resource.h"
 #include "base/android/apk_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
 #include "base/android/memory_pressure_listener_android.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_utils.h"
 #include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/gl/gl_surface.h"
 
 namespace android_webview {
 
 AwBrowserMainParts::AwBrowserMainParts(AwBrowserContext* browser_context)
     : browser_context_(browser_context) {
 }
 
 AwBrowserMainParts::~AwBrowserMainParts() {
@@ skipping 16 matching lines @@
 
   // TODO(primiano, mkosiba): GetApplicationLocale requires a ResourceBundle
   // instance to be present to work correctly so we call this (knowing it will
   // fail) just to create the ResourceBundle instance. We should refactor
   // ResourceBundle/GetApplicationLocale to not require an instance to be
   // initialized.
   ui::ResourceBundle::InitSharedInstanceWithLocale(
       base::android::GetDefaultLocale(),
       NULL,
       ui::ResourceBundle::DO_NOT_LOAD_COMMON_RESOURCES);
-  std::string locale =
-      "assets/" + l10n_util::GetApplicationLocale(std::string()) + ".pak";
-  int pak_fd = base::android::OpenApkAsset(locale, &pak_region);
+  std::string locale = l10n_util::GetApplicationLocale(std::string());
+  std::string pak_path = ui::GetPathForAndroidLocalePakWithinApk(locale);
+  int pak_fd = base::android::OpenApkAsset(pak_path, &pak_region);
   if (pak_fd != -1) {
     ui::ResourceBundle::CleanupSharedInstance();
     ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(
         base::File(pak_fd), pak_region);
   } else {
-    LOG(WARNING) << "Failed to load " << locale << ".pak from the apk too. "
+    LOG(WARNING) << "Failed to load " << locale << ".pak from the apk. "
                     "Bringing up WebView without any locale";
   }
 
   // Try to directly mmap the webviewchromium.pak from the apk. Fall back to
   // load from file, using PATH_SERVICE, otherwise.
   pak_fd = base::android::OpenApkAsset("assets/webviewchromium.pak",
                                        &pak_region);
   if (pak_fd != -1) {
     ui::ResourceBundle::GetSharedInstance().AddDataPackFromFileRegion(
         base::File(pak_fd), pak_region, ui::SCALE_FACTOR_NONE);
@@ skipping 27 matching lines @@
   content::SetMaxURLChars(20 * 1024 * 1024);
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview