content/app/content_main_runner.cc - Issue 317833006: [ICU] Avoid reading ICU data files in render process.

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/app/content_main_runner.cc

Issue 317833006: [ICU] Avoid reading ICU data files in render process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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:

Index: content/app/content_main_runner.cc

diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc

index 8c767321132a4e139bebbc9c7303906a1dda3410..285cd1ba9e4702bcd2882e78070b6f85598795eb 100644

--- a/content/app/content_main_runner.cc

+++ b/content/app/content_main_runner.cc

@@ -702,8 +702,13 @@ class ContentMainRunnerImpl : public ContentMainRunner {

ui::RegisterPathProvider();

RegisterPathProvider();

RegisterContentSchemes(true);

+#if defined(OS_ANDROID)

+ // If delegate_ exists, ICU is initialized in delegate_->PreSandboxStartup()

+ if (!delegate_)

+ CHECK(base::i18n::InitializeICU());

+#else

CHECK(base::i18n::InitializeICU());

+#endif

InitializeStatsTable(command_line);