diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-02 16:21:17 +0000 |
| commit | a5176dafb70d5ea7567b18917d85c4cddc937dc4 (patch) | |
| tree | 45a3a875cb48ee3b54a536ba9a4a7a5902138650 /chrome/browser/back_forward_menu_model.cc | |
| parent | 8e12ae06a009107635e2045db802907fd4ae2df1 (diff) | |
| download | chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.zip chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.gz chromium_src-a5176dafb70d5ea7567b18917d85c4cddc937dc4.tar.bz2 | |
Convert menu strings to UTF16, fix some views-GTK build errors.
Review URL: http://codereview.chromium.org/150171
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/back_forward_menu_model.cc')
| -rw-r--r-- | chrome/browser/back_forward_menu_model.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/chrome/browser/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc index 984d06b..e7b6d68 100644 --- a/chrome/browser/back_forward_menu_model.cc +++ b/chrome/browser/back_forward_menu_model.cc @@ -205,18 +205,17 @@ bool BackForwardMenuModel::IsSeparator(int menu_id) const { return menu_id == history_items + 1; } -std::wstring BackForwardMenuModel::GetItemLabel(int menu_id) const { +string16 BackForwardMenuModel::GetItemLabel(int menu_id) const { // Return label "Show Full History" for the last item of the menu. if (menu_id == GetTotalItemCount()) - return l10n_util::GetString(IDS_SHOWFULLHISTORY_LINK); + return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK); // Return an empty string for a separator. if (IsSeparator(menu_id)) - return L""; + return string16(); NavigationEntry* entry = GetNavigationEntry(menu_id); - return UTF16ToWideHack(entry->GetTitleForDisplay( - &GetTabContents()->controller())); + return entry->GetTitleForDisplay(&GetTabContents()->controller()); } const SkBitmap& BackForwardMenuModel::GetItemIcon(int menu_id) const { @@ -239,8 +238,8 @@ bool BackForwardMenuModel::ItemHasCommand(int menu_id) const { return menu_id - 1 < GetTotalItemCount() && !IsSeparator(menu_id); } -std::wstring BackForwardMenuModel::GetShowFullHistoryLabel() const { - return l10n_util::GetString(IDS_SHOWFULLHISTORY_LINK); +string16 BackForwardMenuModel::GetShowFullHistoryLabel() const { + return l10n_util::GetStringUTF16(IDS_SHOWFULLHISTORY_LINK); } TabContents* BackForwardMenuModel::GetTabContents() const { |