diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 21:12:06 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-25 21:12:06 +0000 |
| commit | bd59d07bba31ad0db0e7b3be96a3462381a2f50a (patch) | |
| tree | 934f028bdb9768b30f1eafd6d9d81e04a53b25f7 /views | |
| parent | 938d6a34f7b50e7c9beb588a2a4b34adb03dcf15 (diff) | |
| download | chromium_src-bd59d07bba31ad0db0e7b3be96a3462381a2f50a.zip chromium_src-bd59d07bba31ad0db0e7b3be96a3462381a2f50a.tar.gz chromium_src-bd59d07bba31ad0db0e7b3be96a3462381a2f50a.tar.bz2 | |
wstring: remove wstring functions from base/i18n/rtl.h
And update callers.
BUG=23581
Review URL: http://codereview.chromium.org/6883140
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82924 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/controls/message_box_view.cc | 3 | ||||
| -rw-r--r-- | views/window/window.cc | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/views/controls/message_box_view.cc b/views/controls/message_box_view.cc index 32892c1..d5e2122 100644 --- a/views/controls/message_box_view.cc +++ b/views/controls/message_box_view.cc @@ -129,7 +129,8 @@ void MessageBoxView::Init(int dialog_flags, // Determine the alignment and directionality based on the first character // with strong directionality. base::i18n::TextDirection direction = - base::i18n::GetFirstStrongCharacterDirection(message_label_->GetText()); + base::i18n::GetFirstStrongCharacterDirection( + WideToUTF16(message_label_->GetText())); Label::Alignment alignment; if (direction == base::i18n::RIGHT_TO_LEFT) alignment = Label::ALIGN_RIGHT; diff --git a/views/window/window.cc b/views/window/window.cc index 77a8b42..c10e569 100644 --- a/views/window/window.cc +++ b/views/window/window.cc @@ -5,6 +5,7 @@ #include "views/window/window.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_font_util.h" #include "ui/base/resource/resource_bundle.h" @@ -192,13 +193,13 @@ void Window::UpdateWindowTitle() { // Update the native frame's text. We do this regardless of whether or not // the native frame is being used, since this also updates the taskbar, etc. - std::wstring window_title; + string16 window_title; if (native_window_->AsNativeWidget()->IsScreenReaderActive()) - window_title = window_delegate_->GetAccessibleWindowTitle(); + window_title = WideToUTF16(window_delegate_->GetAccessibleWindowTitle()); else - window_title = window_delegate_->GetWindowTitle(); + window_title = WideToUTF16(window_delegate_->GetWindowTitle()); base::i18n::AdjustStringForLocaleDirection(&window_title); - native_window_->SetWindowTitle(window_title); + native_window_->SetWindowTitle(UTF16ToWide(window_title)); } void Window::UpdateWindowIcon() { |