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/bookmark_bar_view.cc | |
| 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/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/ui/views/bookmark_bar_view.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index 0631169..f672ceb 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -915,7 +915,7 @@ void BookmarkBarView::Init() { bookmarks_separator_view_ = new ButtonSeparatorView(); bookmarks_separator_view_->SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR))); + l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR)); AddChildView(bookmarks_separator_view_); instructions_ = new BookmarkBarInstructionsView(this); @@ -937,7 +937,7 @@ MenuButton* BookmarkBarView::CreateOtherBookmarkedButton() { button->SetContextMenuController(this); button->set_tag(kOtherFolderButtonTag); button->SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED))); + l10n_util::GetStringUTF16(IDS_BOOMARK_BAR_OTHER_BOOKMARKED)); return button; } @@ -959,7 +959,7 @@ MenuButton* BookmarkBarView::CreateOverflowButton() { button->SetVisible(false); // Set accessibility name. button->SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS_CHEVRON))); + l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS_CHEVRON)); return button; } @@ -1288,7 +1288,7 @@ views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) { void BookmarkBarView::ConfigureButton(const BookmarkNode* node, views::TextButton* button) { button->SetText(UTF16ToWide(node->GetTitle())); - button->SetAccessibleName(UTF16ToWide(node->GetTitle())); + button->SetAccessibleName(node->GetTitle()); button->SetID(VIEW_ID_BOOKMARK_BAR_ELEMENT); // We don't always have a theme provider (ui tests, for example). if (GetThemeProvider()) { @@ -1736,7 +1736,7 @@ views::TextButton* BookmarkBarView::CreateSyncErrorButton() { sync_error_button->SetTooltipText( UTF16ToWide(l10n_util::GetStringUTF16(IDS_SYNC_BOOKMARK_BAR_ERROR_DESC))); sync_error_button->SetAccessibleName( - UTF16ToWide(l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON))); + l10n_util::GetStringUTF16(IDS_ACCNAME_SYNC_ERROR_BUTTON)); sync_error_button->SetIcon( *ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING)); return sync_error_button; |