diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 07:27:42 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 07:27:42 +0000 |
| commit | c32d31eab915dcff1f128bf744ced2ad8fa221ef (patch) | |
| tree | 69a8fbf3b9360c6401bb4658893cafc4b2f209ed /app/win_util.cc | |
| parent | 6ee50a8d443f48e70921a8eed76f26a6e9844228 (diff) | |
| download | chromium_src-c32d31eab915dcff1f128bf744ced2ad8fa221ef.zip chromium_src-c32d31eab915dcff1f128bf744ced2ad8fa221ef.tar.gz chromium_src-c32d31eab915dcff1f128bf744ced2ad8fa221ef.tar.bz2 | |
Cleanup AdjustStringForLocaleDirection() to modify input parameter in place.
As described in the bug, the current behavior is confusing and bug-prone.
BUG=47194
TEST=Check that there are no visible regressions in RTL and LTR language UIs on Linux & Windows.
Review URL: http://codereview.chromium.org/5154009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67237 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/win_util.cc')
| -rw-r--r-- | app/win_util.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/win_util.cc b/app/win_util.cc index be267af..b3a0571 100644 --- a/app/win_util.cc +++ b/app/win_util.cc @@ -533,15 +533,13 @@ int MessageBox(HWND hwnd, if (base::i18n::IsRTL()) actual_flags |= MB_RIGHT | MB_RTLREADING; - std::wstring localized_text; - const wchar_t* text_ptr = text.c_str(); - if (base::i18n::AdjustStringForLocaleDirection(text, &localized_text)) - text_ptr = localized_text.c_str(); - - std::wstring localized_caption; - const wchar_t* caption_ptr = caption.c_str(); - if (base::i18n::AdjustStringForLocaleDirection(caption, &localized_caption)) - caption_ptr = localized_caption.c_str(); + std::wstring localized_text = text; + base::i18n::AdjustStringForLocaleDirection(&localized_text); + const wchar_t* text_ptr = localized_text.c_str(); + + std::wstring localized_caption = caption; + base::i18n::AdjustStringForLocaleDirection(&localized_caption); + const wchar_t* caption_ptr = localized_caption.c_str(); return ::MessageBox(hwnd, text_ptr, caption_ptr, actual_flags); } |