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

Unified Diff: services/shell/runner/init.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 | « services/shell/public/cpp/lib/initialize_base_and_icu.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/shell/runner/init.cc
diff --git a/services/shell/runner/init.cc b/services/shell/runner/init.cc
index a78e3f34a8cfa887fe24b815f47caa76c0d180ef..8d095f0f2fcdb3cf7a0744dee445925a723ef3ab 100644
--- a/services/shell/runner/init.cc
+++ b/services/shell/runner/init.cc
@@ -76,6 +76,8 @@ void WaitForDebuggerIfNecessary() {
void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
// Do whatever warming that the mojo application wants.
+
+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
typedef void (*LibraryEarlyInitFunction)(const uint8_t*);
LibraryEarlyInitFunction init_function =
reinterpret_cast<LibraryEarlyInitFunction>(
@@ -87,6 +89,7 @@ void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
const uint8_t* icu_data = base::i18n::GetRawIcuMemory();
init_function(icu_data);
}
+#endif // ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
// TODO(erg): All chromium binaries load base. We might want to make a
// general system for other people.
« no previous file with comments | « services/shell/public/cpp/lib/initialize_base_and_icu.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698