content/browser/battery_status/battery_monitor_integration_browsertest.cc - Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up).

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: content/browser/battery_status/battery_monitor_integration_browsertest.cc

Issue 1181953002: Load non-locale .pak files directly from the .apk on Android (rather than extracting on start-up). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@raw-paks

Patch Set: yfriedman review comments 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

« build/android/gyp/locale_pak_resources.py ('K') | « components/test/android/browsertests_apk/src/org/chromium/components_browsertests_apk/ComponentsBrowserTestsApplication.java ('k') | content/browser/child_process_launcher.cc » ('j') | ui/base/resource/resource_bundle_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/battery_status/battery_monitor_integration_browsertest.cc

diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc

index 541d76938dcd236b397fb338428d316e9f45497c..47ead10f1b35d8332acd0fc303872e575a2742f7 100644

--- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc

+++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc

@@ -96,9 +96,10 @@ class TestContentBrowserClient : public ContentBrowserClient {

void GetAdditionalMappedFilesForChildProcess(

const base::CommandLine& command_line,

int child_process_id,

- FileDescriptorInfo* mappings) override {

+ FileDescriptorInfo* mappings,

+ std::map<int, base::MemoryMappedFile::Region>* regions) override {

ShellContentBrowserClient::Get()->GetAdditionalMappedFilesForChildProcess(

- command_line, child_process_id, mappings);

+ command_line, child_process_id, mappings, regions);

}

#endif // defined(OS_ANDROID)

};