summaryrefslogtreecommitdiffstats
path: root/base/icu_util.cc
diff options
context:
space:
mode:
authorevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 23:54:04 +0000
committerevanm@google.com <evanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-30 23:54:04 +0000
commit640517fdd23e08ed95cf129d27457db817ee6124 (patch)
tree2674bc857b9d1b566e05bcfa1dd5c8cfd1897dbf /base/icu_util.cc
parentf92ed219c9aeeed79993d1d32f34e5d5c9888dbe (diff)
downloadchromium_src-640517fdd23e08ed95cf129d27457db817ee6124.zip
chromium_src-640517fdd23e08ed95cf129d27457db817ee6124.tar.gz
chromium_src-640517fdd23e08ed95cf129d27457db817ee6124.tar.bz2
Begin the first small step towards using FilePath everywhere:
- Add some transition APIs. - Start migrating some code to transition APIs. Review URL: http://codereview.chromium.org/8825 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/icu_util.cc')
-rw-r--r--base/icu_util.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/base/icu_util.cc b/base/icu_util.cc
index 17f934d..2606545 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,10 @@ 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(data_path.value().c_str());
// Only look for the packaged data file;
// the default behavior is to look for individual files.
UErrorCode err = U_ZERO_ERROR;