diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 18:38:51 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-04 18:38:51 +0000 |
| commit | d5c45b71091a6a70cb051bdcd35a125e3fba6729 (patch) | |
| tree | 276bbb5f6ce2c27ab602be95093dd0dfbbc14039 /app | |
| parent | 72cf2cbaab582d550edb3a5931b6c478e1b685f2 (diff) | |
| download | chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.zip chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.tar.gz chromium_src-d5c45b71091a6a70cb051bdcd35a125e3fba6729.tar.bz2 | |
Remove wstring from l10n_util. Part 4.
BUG=9911
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/5958017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70423 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/l10n_util_win.cc | 4 | ||||
| -rw-r--r-- | app/os_exchange_data_provider_win.cc | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/l10n_util_win.cc b/app/l10n_util_win.cc index eacdb35..d1e9392 100644 --- a/app/l10n_util_win.cc +++ b/app/l10n_util_win.cc @@ -123,9 +123,9 @@ bool NeedOverrideDefaultUIFont(std::wstring* override_font_family, ui_font_size_scaler_id = IDS_UI_FONT_SIZE_SCALER_XP; } - std::wstring ui_font_family = GetString(ui_font_family_id); + std::wstring ui_font_family = GetStringUTF16(ui_font_family_id); int scaler100; - if (!base::StringToInt(l10n_util::GetString(ui_font_size_scaler_id), + if (!base::StringToInt(l10n_util::GetStringUTF16(ui_font_size_scaler_id), &scaler100)) return false; diff --git a/app/os_exchange_data_provider_win.cc b/app/os_exchange_data_provider_win.cc index 032380a..d6635ea 100644 --- a/app/os_exchange_data_provider_win.cc +++ b/app/os_exchange_data_provider_win.cc @@ -846,7 +846,8 @@ static void CreateValidFileNameFromTitle(const GURL& url, url, std::string(), std::string(), FilePath()).ToWStringHack(); } else { // Nothing else can be done, just use a default. - *validated = l10n_util::GetString(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME); + *validated = + l10n_util::GetStringUTF16(IDS_APP_UNTITLED_SHORTCUT_FILE_NAME); } } else { *validated = title; |