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

Unified Diff: base/i18n/icu_util.cc

Issue 293013: Deprecate PathService::Get(..., wstring*) and use FilePath instead. (Closed)
Patch Set: Created 11 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
Index: base/i18n/icu_util.cc
diff --git a/base/i18n/icu_util.cc b/base/i18n/icu_util.cc
index 6239a01ea829746e982d45f5061e47aadb14a76a..1d1d2119a6c8e87545788d464954befee7bbfee9 100644
--- a/base/i18n/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -56,12 +56,11 @@ bool Initialize() {
#if (ICU_UTIL_DATA_IMPL == ICU_UTIL_DATA_SHARED)
// We expect to find the ICU data module alongside the current module.
- std::wstring data_path;
+ FilePath data_path;
PathService::Get(base::DIR_MODULE, &data_path);
- file_util::AppendToPath(&data_path,
- ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));
+ data_path = data_path.Append(ASCIIToWide(ICU_UTIL_DATA_SHARED_MODULE_NAME));
tony 2009/10/19 22:46:49 Nit: AppendASCII?
- HMODULE module = LoadLibrary(data_path.c_str());
+ HMODULE module = LoadLibrary(data_path.value().c_str());
if (!module) {
LOG(ERROR) << "Failed to load " << ICU_UTIL_DATA_SHARED_MODULE_NAME;
return false;
« no previous file with comments | « base/base_paths_win.cc ('k') | base/path_service.h » ('j') | chrome/browser/user_data_manager.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698