Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(254)

Unified Diff: services/shell/public/cpp/lib/initialize_base_and_icu.cc

Issue 1989333002: Fix icu_use_data_file = false. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update DEPS for ICU. Created 4 years, 7 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 | « base/i18n/icu_util.cc ('k') | services/shell/runner/init.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/public/cpp/lib/initialize_base_and_icu.cc
diff --git a/services/shell/public/cpp/lib/initialize_base_and_icu.cc b/services/shell/public/cpp/lib/initialize_base_and_icu.cc
index 4277f4f46f9663cd056d85e0b8937dc02373c2ae..b910f0feea01e68cdf17d0f76fb748dbe97b6bf9 100644
--- a/services/shell/public/cpp/lib/initialize_base_and_icu.cc
+++ b/services/shell/public/cpp/lib/initialize_base_and_icu.cc
@@ -35,11 +35,13 @@ InitializeBase(const uint8_t* icu_data) {
base::SysInfo::MaxSharedMemorySize();
#endif
+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
// Initialize core ICU. We must perform the full initialization before we
// initialize icu::TimeZone subsystem because otherwise ICU gets in a state
// where the timezone data is disconnected from the locale data which can
// cause crashes.
CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
+#endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
#if !defined(OS_ANDROID)
// ICU DateFormat class (used in base/time_format.cc) needs to get the
« no previous file with comments | « base/i18n/icu_util.cc ('k') | services/shell/runner/init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698