diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 18:34:56 +0000 |
| commit | 001f08ab3184a370fdd1e8cf4cef05fa15174bd9 (patch) | |
| tree | 2d808b05a8f8294af7346c0e7f8af472266023e1 /chrome/browser/ui/views/infobars | |
| parent | 6784252af99d1da6c63871374d9409998c64ef5b (diff) | |
| download | chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.zip chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.gz chromium_src-001f08ab3184a370fdd1e8cf4cef05fa15174bd9.tar.bz2 | |
Remove wstring from views. Part 3: Switch accessibility strings to string16.
BUG=68267
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6192007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71461 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/views/infobars')
| -rw-r--r-- | chrome/browser/ui/views/infobars/infobar_container.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/infobars/infobars.cc | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc index 1b7dd33..5f62201 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.cc +++ b/chrome/browser/ui/views/infobars/infobar_container.cc @@ -21,7 +21,7 @@ InfoBarContainer::InfoBarContainer(Delegate* delegate) tab_contents_(NULL) { SetID(VIEW_ID_INFO_BAR_CONTAINER); SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER))); + l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER)); } InfoBarContainer::~InfoBarContainer() { diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc index f5e7604..9698b51 100644 --- a/chrome/browser/ui/views/infobars/infobars.cc +++ b/chrome/browser/ui/views/infobars/infobars.cc @@ -97,12 +97,12 @@ InfoBar::InfoBar(InfoBarDelegate* delegate) switch (delegate->GetInfoBarType()) { case InfoBarDelegate::WARNING_TYPE: - SetAccessibleName(UTF16ToWide( - l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_WARNING))); + SetAccessibleName( + l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_WARNING)); break; case InfoBarDelegate::PAGE_ACTION_TYPE: - SetAccessibleName(UTF16ToWide( - l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_PAGE_ACTION))); + SetAccessibleName( + l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_PAGE_ACTION)); break; default: NOTREACHED(); @@ -117,7 +117,7 @@ InfoBar::InfoBar(InfoBarDelegate* delegate) close_button_->SetImage(views::CustomButton::BS_PUSHED, rb.GetBitmapNamed(IDR_CLOSE_BAR_P)); close_button_->SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE))); + l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE)); AddChildView(close_button_); animation_.reset(new ui::SlideAnimation(this)); @@ -472,10 +472,10 @@ ConfirmInfoBar::ConfirmInfoBar(ConfirmInfoBarDelegate* delegate) initialized_(false) { ok_button_ = InfoBarTextButton::Create(this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_OK)); - ok_button_->SetAccessibleName(ok_button_->text()); + ok_button_->SetAccessibleName(WideToUTF16Hack(ok_button_->text())); cancel_button_ = InfoBarTextButton::Create(this, delegate->GetButtonLabel(ConfirmInfoBarDelegate::BUTTON_CANCEL)); - cancel_button_->SetAccessibleName(cancel_button_->text()); + cancel_button_->SetAccessibleName(WideToUTF16Hack(cancel_button_->text())); // Set up the link. link_ = new views::Link; |