diff options
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; |