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

Unified Diff: base/icu_util.cc

Issue 8825: Begin the first small step towards using FilePath everywhere: (Closed)
Patch Set: works on windows Created 12 years, 2 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/file_util_win.cc ('k') | base/path_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/icu_util.cc
diff --git a/base/icu_util.cc b/base/icu_util.cc
index 17f934d89fd20880fdbfee00c83c79b45cc61d47..95b0bf32e6fb60e0bc7a326911f210503f105137 100644
--- a/base/icu_util.cc
+++ b/base/icu_util.cc
@@ -12,8 +12,9 @@
#include "base/icu_util.h"
-#include "base/logging.h"
+#include "base/file_path.h"
#include "base/file_util.h"
+#include "base/logging.h"
#include "base/path_service.h"
#include "base/sys_string_conversions.h"
#include "unicode/putil.h"
@@ -76,10 +77,11 @@ bool Initialize() {
// For now, expect the data file to be alongside the executable.
// This is sufficient while we work on unit tests, but will eventually
// likely live in a data directory.
- std::wstring data_path;
+ FilePath data_path;
bool path_ok = PathService::Get(base::DIR_EXE, &data_path);
DCHECK(path_ok);
- u_setDataDirectory(base::SysWideToNativeMB(data_path).c_str());
+ u_setDataDirectory(
+ base::SysWideToNativeMB(data_path.ToWStringHack()).c_str());
// Only look for the packaged data file;
// the default behavior is to look for individual files.
UErrorCode err = U_ZERO_ERROR;
« no previous file with comments | « base/file_util_win.cc ('k') | base/path_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698