Load language .pak files directly from the apk when using splits

chrome/browser/chrome_browser_main_android.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/browser/chrome_browser_main_android.h"
 
+#include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/browser/android/chrome_media_client_android.h"
 #include "chrome/browser/android/seccomp_support_detector.h"
 #include "chrome/browser/google/google_search_counter_android.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/crash/app/breakpad_linux.h"
 #include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/main_function_params.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/resource/resource_bundle_android.h"
 #include "ui/base/ui_base_paths.h"
 
 ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid(
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainParts(parameters) {
 }
 
 ChromeBrowserMainPartsAndroid::~ChromeBrowserMainPartsAndroid() {
 }
 
@@ skipping 17 matching lines @@
   if (!breakpad_enabled)
     breakpad_enabled = base::CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableCrashReporterForTesting);
 
   if (breakpad_enabled) {
     base::FilePath crash_dump_dir;
     PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir);
     crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir));
   }
 
+  bool has_splits = base::android::BuildInfo::GetInstance()->has_apk_splits();

[Yaron, 2015/06/18 20:45:43]

how'd you pick here?

[agrieve, 2015/06/19 01:37:25]

This is where webview does it
(android_webview/browser/aw_browser_main_parts.cc). If there's a more
appropriate spot just let me know though.

+  ui::SetLocalePaksStoredInApk(has_splits);
+
   return ChromeBrowserMainParts::PreCreateThreads();
 }
 
 void ChromeBrowserMainPartsAndroid::PostProfileInit() {
   Profile* main_profile = profile();
   search_counter_.reset(new GoogleSearchCounterAndroid(main_profile));
 
   ChromeBrowserMainParts::PostProfileInit();
 }
 
@@ skipping 36 matching lines @@
   ChromeBrowserMainParts::PostBrowserStart();
 
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(FROM_HERE,
       base::Bind(&SeccompSupportDetector::StartDetection),
       base::TimeDelta::FromMinutes(1));
 }
 
 void ChromeBrowserMainPartsAndroid::ShowMissingLocaleMessageBox() {
   NOTREACHED();
 }