mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: bump chromium to 98ebf6c3f0b7bd96bdb1a4b42208f (master) (#22999)

Browse source 
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: Electron Bot <anonymous@electronjs.org>
Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net>
This commit is contained in:
Electron Bot 2020-04-13 16:39:26 -07:00 • committed by GitHub
parent b8c1709a88
commit 3e8d77d564
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
106 changed files with 645 additions and 673 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/ui/cocoa/electron_menu_controller.mm
View file

@ -236,9 +236,9 @@ static base::scoped_nsobject<NSMenu> recentDocumentsMenuSwap_;
keyEquivalent:@""]);
// If the menu item has an icon, set it.
gfx::Image icon;
if (model->GetIconAt(index, &icon) && !icon.IsEmpty())
[item setImage:icon.ToNSImage()];
ui::ImageModel icon = model->GetIconAt(index);
if (icon.IsImage())
[item setImage:icon.GetImage().ToNSImage()];
base::string16 toolTip = model->GetToolTipAt(index);
[item setToolTip:base::SysUTF16ToNSString(toolTip)];