chrome/browser/chrome_content_browser_client.h - 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_content_browser_client.h

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: 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

« chrome/browser/chrome_browser_main_android.cc ('K') | « chrome/browser/chrome_browser_main_android.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | ui/base/resource/resource_bundle_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chrome_content_browser_client.h

diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h

index 274dfdbdc7c553b7123c0d027d1db142e70d39c2..0e5204db0f66693b46fc4b563e73006d655d9e13 100644

--- a/chrome/browser/chrome_content_browser_client.h

+++ b/chrome/browser/chrome_content_browser_client.h

@@ -301,6 +301,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {

const base::Callback<void(bool)>& callback);

#endif

+#if defined(OS_ANDROID)

+ base::ScopedFD locale_pak_fd_;

+ base::MemoryMappedFile::Region locale_pak_region_;

+#endif

#if defined(ENABLE_PLUGINS)

// Set of origins that can use TCP/UDP private APIs from NaCl.

std::set<std::string> allowed_socket_origins_;