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

Unified Diff: base/i18n/icu_util.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.h ('k') | services/shell/public/cpp/lib/initialize_base_and_icu.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/icu_util.cc
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index 05e14671e21c062d4ea09019bfa297d7bee2f932..c85195f06d8ff4657f9ff99f9fc89b1a121d18ba 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -36,10 +36,6 @@
#include "base/mac/foundation_util.h"
#endif
-#define ICU_UTIL_DATA_FILE 0
-#define ICU_UTIL_DATA_SHARED 1
-#define ICU_UTIL_DATA_STATIC 2
-
namespace base {
namespace i18n {
@@ -60,6 +56,8 @@ bool g_check_called_once = true;
bool g_called_once = false;
#endif // !defined(NDEBUG)
+#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
+
// To debug http://crbug.com/445616.
int g_debug_icu_last_error;
int g_debug_icu_load;
@@ -68,8 +66,6 @@ int g_debug_icu_pf_last_error;
#if defined(OS_WIN)
wchar_t g_debug_icu_pf_filename[_MAX_PATH];
#endif // OS_WIN
-
-#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_FILE
// Use an unversioned file name to simplify a icu version update down the road.
// No need to change the filename in multiple places (gyp files, windows
// build pkg configurations, etc). 'l' stands for Little Endian.
« no previous file with comments | « base/i18n/icu_util.h ('k') | services/shell/public/cpp/lib/initialize_base_and_icu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698