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

chore: bump chromium to 1a093e6a0cb5e72ba78990fe39824 (master) (#24575)

Browse source
This commit is contained in:
Electron Bot 2020-07-21 22:34:34 -07:00 • committed by GitHub
parent d4a4269989
commit 2fb14f53fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
81 changed files with 407 additions and 346 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/ui/tray_icon_cocoa.mm
View file

@ -7,9 +7,9 @@
#include <string>
#include <vector>
#include "base/message_loop/message_loop_current.h"
#include "base/message_loop/message_pump_mac.h"
#include "base/strings/sys_string_conversions.h"
#include "base/task/current_thread.h"
#include "base/task/post_task.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@ -177,7 +177,7 @@
- (void)popUpContextMenu:(electron::ElectronMenuModel*)menu_model {
// Make sure events can be pumped while the menu is up.
base::MessageLoopCurrent::ScopedNestableTaskAllower allow;
base::CurrentThread::ScopedNestableTaskAllower allow;
// Show a custom menu.
if (menu_model) {