diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-29 00:45:28 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-29 00:45:28 +0000 |
| commit | 44063b4e3ea781d1f9cbfd392e2cec56a8f54509 (patch) | |
| tree | c582c8bbd42e37dd07534273882ca05719d9f78e /chrome/browser/views/bookmark_menu_controller_views.cc | |
| parent | 969894aba3265e77edafbc6556941ea693485cd8 (diff) | |
| download | chromium_src-44063b4e3ea781d1f9cbfd392e2cec56a8f54509.zip chromium_src-44063b4e3ea781d1f9cbfd392e2cec56a8f54509.tar.gz chromium_src-44063b4e3ea781d1f9cbfd392e2cec56a8f54509.tar.bz2 | |
Remove wstrings from bookmarks, part 17.
This converts lots of (wstring) GetTitle()s to (string16) GetTitleAsString16().
Soon, I'll be able to delete the former, and rename the latter (s/AsString16//).
BUG=23581
TEST=builds and passes tests
Review URL: http://codereview.chromium.org/3226004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57800 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_menu_controller_views.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_menu_controller_views.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/views/bookmark_menu_controller_views.cc b/chrome/browser/views/bookmark_menu_controller_views.cc index cabef91..fd8171e 100644 --- a/chrome/browser/views/bookmark_menu_controller_views.cc +++ b/chrome/browser/views/bookmark_menu_controller_views.cc @@ -319,13 +319,14 @@ void BookmarkMenuController::BuildMenu(const BookmarkNode* parent, icon = *ResourceBundle::GetSharedInstance(). GetBitmapNamed(IDR_DEFAULT_FAVICON); } - menu->AppendMenuItemWithIcon(id, node->GetTitle(), icon); + menu->AppendMenuItemWithIcon(id, UTF16ToWide(node->GetTitleAsString16()), + icon); node_to_menu_id_map_[node] = id; } else if (node->is_folder()) { SkBitmap* folder_icon = ResourceBundle::GetSharedInstance(). GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER); - MenuItemView* submenu = - menu->AppendSubMenuWithIcon(id, node->GetTitle(), *folder_icon); + MenuItemView* submenu = menu->AppendSubMenuWithIcon(id, + UTF16ToWide(node->GetTitleAsString16()), *folder_icon); node_to_menu_id_map_[node] = id; BuildMenu(node, 0, submenu, next_menu_id); } else { |