chrome/browser/chrome_browser_main_android.cc - Issue 1187433006: Load language .pak files directly from the apk when using splits

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main_android.cc

Issue 1187433006: Load language .pak files directly from the apk when using splits (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@locale-res-or-file

Patch Set: Fix ui_base_unittest failure (allow locale paks to be loaded multiple times) Created 5 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

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeMobileApplication.java ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_browser_main_android.cc

diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc

index 4e05a99efb8c1cacb43d8127db79030e7dfc328c..4110fc84b972fadf06c8519b1d8465786e7e485d 100644

--- a/chrome/browser/chrome_browser_main_android.cc

+++ b/chrome/browser/chrome_browser_main_android.cc

@@ -4,6 +4,7 @@

#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"

@@ -22,6 +23,7 @@

#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(

@@ -59,6 +61,9 @@ int ChromeBrowserMainPartsAndroid::PreCreateThreads() {

crash_dump_manager_.reset(new breakpad::CrashDumpManager(crash_dump_dir));

}

+ bool has_splits = base::android::BuildInfo::GetInstance()->has_apk_splits();

+ ui::SetLocalePaksStoredInApk(has_splits);

return ChromeBrowserMainParts::PreCreateThreads();

}