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

Unified Diff: base/i18n/icu_util.cc

Issue 1446363003: Deleted OS_WIN and all Windows specific files from base. (Closed) Base URL: https://github.com/domokit/mojo.git@base_tests
Patch Set: Created 5 years, 1 month 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/file_util_icu_unittest.cc ('k') | base/i18n/icu_util_nacl_win64.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 a9f0b129633cd596934b8cf7d680d1fcca7f7a8a..98846e801a3da14271aca781d58ed089512c04b9 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -4,10 +4,6 @@
#include "base/i18n/icu_util.h"
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
-
#include <string>
#include "base/debug/alias.h"
@@ -41,9 +37,6 @@ namespace i18n {
const char kIcuDataFileName[] = "icudtl.dat";
#if ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED
#define ICU_UTIL_DATA_SYMBOL "icudt" U_ICU_VERSION_SHORT "_dat"
-#if defined(OS_WIN)
-#define ICU_UTIL_DATA_SHARED_MODULE_NAME "icudt.dll"
-#endif
#endif
namespace {
@@ -130,14 +123,7 @@ bool InitializeICU() {
if (!mapped_file.IsValid()) {
#if !defined(OS_MACOSX)
FilePath data_path;
-#if defined(OS_WIN)
- // The data file will be in the same directory as the current module.
- bool path_ok = PathService::Get(DIR_MODULE, &data_path);
- wchar_t tmp_buffer[_MAX_PATH] = {0};
- wcscpy_s(tmp_buffer, data_path.value().c_str());
- debug::Alias(tmp_buffer);
- CHECK(path_ok); // TODO(scottmg): http://crbug.com/445616
-#elif defined(OS_ANDROID)
+#if defined(OS_ANDROID)
bool path_ok = PathService::Get(DIR_ANDROID_APP_DATA, &data_path);
#else
// For now, expect the data file to be alongside the executable.
@@ -148,13 +134,6 @@ bool InitializeICU() {
DCHECK(path_ok);
data_path = data_path.AppendASCII(kIcuDataFileName);
-#if defined(OS_WIN)
- // TODO(scottmg): http://crbug.com/445616
- wchar_t tmp_buffer2[_MAX_PATH] = {0};
- wcscpy_s(tmp_buffer2, data_path.value().c_str());
- debug::Alias(tmp_buffer2);
-#endif
-
#else
// Assume it is in the framework bundle's Resources directory.
ScopedCFTypeRef<CFStringRef> data_file_name(
@@ -167,9 +146,6 @@ bool InitializeICU() {
}
#endif // OS check
if (!mapped_file.Initialize(data_path)) {
-#if defined(OS_WIN)
- CHECK(false); // TODO(scottmg): http://crbug.com/445616
-#endif
LOG(ERROR) << "Couldn't mmap " << data_path.AsUTF8Unsafe();
return false;
}
@@ -177,9 +153,6 @@ bool InitializeICU() {
UErrorCode err = U_ZERO_ERROR;
udata_setCommonData(const_cast<uint8*>(mapped_file.data()), &err);
result = (err == U_ZERO_ERROR);
-#if defined(OS_WIN)
- CHECK(result); // TODO(scottmg): http://crbug.com/445616
-#endif
#endif
// To respond to the timezone change properly, the default timezone
« no previous file with comments | « base/i18n/file_util_icu_unittest.cc ('k') | base/i18n/icu_util_nacl_win64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698