diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 05:31:40 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-30 05:31:40 +0000 |
| commit | 440b37b2c3a29be151a7262d9188d5e8151176fb (patch) | |
| tree | b2cc9283d1efd597472619dcfd016a4a0f0e32ff /chrome/browser/views/bookmark_bar_view.cc | |
| parent | 6cd3bd20cd448bc1bca33748395bf4381dfb7fc6 (diff) | |
| download | chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.zip chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.gz chromium_src-440b37b2c3a29be151a7262d9188d5e8151176fb.tar.bz2 | |
Remove the wstring TreeModelNode::GetTitle() and rename GetTitleAsString16() to GetTitle().
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3279005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bar_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_bar_view.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index c741807..4aeab9c 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -15,6 +15,7 @@ #include "app/text_elider.h" #include "base/i18n/rtl.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/browser.h" @@ -1257,12 +1258,12 @@ void BookmarkBarView::ShowContextMenu(View* source, views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) { if (node->is_url()) { BookmarkButton* button = new BookmarkButton(this, node->GetURL(), - UTF16ToWide(node->GetTitleAsString16()), GetProfile()); + UTF16ToWide(node->GetTitle()), GetProfile()); ConfigureButton(node, button); return button; } else { views::MenuButton* button = new BookmarkFolderButton(this, - UTF16ToWide(node->GetTitleAsString16()), this, false); + UTF16ToWide(node->GetTitle()), this, false); button->SetIcon(GetGroupIcon()); ConfigureButton(node, button); return button; @@ -1271,8 +1272,8 @@ views::View* BookmarkBarView::CreateBookmarkButton(const BookmarkNode* node) { void BookmarkBarView::ConfigureButton(const BookmarkNode* node, views::TextButton* button) { - button->SetText(UTF16ToWide(node->GetTitleAsString16())); - button->SetAccessibleName(UTF16ToWide(node->GetTitleAsString16())); + button->SetText(UTF16ToWide(node->GetTitle())); + button->SetAccessibleName(UTF16ToWide(node->GetTitle())); button->SetID(VIEW_ID_BOOKMARK_BAR_ELEMENT); // We don't always have a theme provider (ui tests, for example). if (GetThemeProvider()) { |