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

Unified Diff: base/i18n/icu_util.cc

Issue 99473012: Enable icu_use_data_file on Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add icu{uc,i18n} dependency to base_unittests Created 7 years 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
Index: base/i18n/icu_util.cc
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index e5c698475e4ad9f7710ce3edc3c2a0d1839ba38b..5c3c60552a335cbdcb9047217fac97a31e621397 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -18,6 +18,9 @@
#include "base/path_service.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
+#if defined(OS_WIN)
+#include "base/strings/utf_string_conversions.h"
+#endif
#include "third_party/icu/source/common/unicode/putil.h"
#include "third_party/icu/source/common/unicode/udata.h"
@@ -104,7 +107,11 @@ bool InitializeICU() {
}
#endif // OS check
if (!mapped_file.Initialize(data_path)) {
+#if defined(OS_WIN)
+ DLOG(ERROR) << "Couldn't mmap " << base::UTF16ToUTF8(data_path.value());
Mark Mentovai 2013/12/17 22:12:02 You can do this on all platforms, getting rid of t
jungshik at Google 2013/12/18 20:59:11 Thanks. I went with AsUTF8Unsafe.
+#else
DLOG(ERROR) << "Couldn't mmap " << data_path.value();
+#endif
return false;
}
}

Powered by Google App Engine
This is Rietveld 408576698