chore: bump chromium to 92.0.4499.0 (master) (#29046)
This commit is contained in:
parent
cbba602eae
commit
d5f2eb5a81
56 changed files with 162 additions and 148 deletions
|
@ -117,7 +117,7 @@ class BrowserWindow : public BaseWindow,
|
|||
|
||||
// Closure that would be called when window is unresponsive when closing,
|
||||
// it should be cancelled when we can prove that the window is responsive.
|
||||
base::CancelableClosure window_unresponsive_closure_;
|
||||
base::CancelableRepeatingClosure window_unresponsive_closure_;
|
||||
|
||||
#if defined(OS_MAC)
|
||||
std::vector<mojom::DraggableRegionPtr> draggable_regions_;
|
||||
|
|
|
@ -73,7 +73,7 @@ void GlobalShortcut::OnKeyPressed(const ui::Accelerator& accelerator) {
|
|||
|
||||
bool GlobalShortcut::RegisterAll(
|
||||
const std::vector<ui::Accelerator>& accelerators,
|
||||
const base::Closure& callback) {
|
||||
const base::RepeatingClosure& callback) {
|
||||
if (!electron::Browser::Get()->is_ready()) {
|
||||
gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
|
||||
.ThrowError("globalShortcut cannot be used before the app is ready");
|
||||
|
@ -94,7 +94,7 @@ bool GlobalShortcut::RegisterAll(
|
|||
}
|
||||
|
||||
bool GlobalShortcut::Register(const ui::Accelerator& accelerator,
|
||||
const base::Closure& callback) {
|
||||
const base::RepeatingClosure& callback) {
|
||||
if (!electron::Browser::Get()->is_ready()) {
|
||||
gin_helper::ErrorThrower(JavascriptEnvironment::GetIsolate())
|
||||
.ThrowError("globalShortcut cannot be used before the app is ready");
|
||||
|
|
|
@ -35,12 +35,13 @@ class GlobalShortcut : public extensions::GlobalShortcutListener::Observer,
|
|||
~GlobalShortcut() override;
|
||||
|
||||
private:
|
||||
typedef std::map<ui::Accelerator, base::Closure> AcceleratorCallbackMap;
|
||||
typedef std::map<ui::Accelerator, base::RepeatingClosure>
|
||||
AcceleratorCallbackMap;
|
||||
|
||||
bool RegisterAll(const std::vector<ui::Accelerator>& accelerators,
|
||||
const base::Closure& callback);
|
||||
const base::RepeatingClosure& callback);
|
||||
bool Register(const ui::Accelerator& accelerator,
|
||||
const base::Closure& callback);
|
||||
const base::RepeatingClosure& callback);
|
||||
bool IsRegistered(const ui::Accelerator& accelerator);
|
||||
void Unregister(const ui::Accelerator& accelerator);
|
||||
void UnregisterSome(const std::vector<ui::Accelerator>& accelerators);
|
||||
|
|
|
@ -155,7 +155,7 @@ class Browser : public WindowListObserver {
|
|||
|
||||
#if defined(OS_MAC)
|
||||
// Set the handler which decides whether to shutdown.
|
||||
void SetShutdownHandler(base::Callback<bool()> handler);
|
||||
void SetShutdownHandler(base::RepeatingCallback<bool()> handler);
|
||||
|
||||
// Hide the application.
|
||||
void Hide();
|
||||
|
|
|
@ -93,7 +93,7 @@ v8::Local<v8::Promise> Browser::GetApplicationInfoForProtocol(
|
|||
return handle;
|
||||
}
|
||||
|
||||
void Browser::SetShutdownHandler(base::Callback<bool()> handler) {
|
||||
void Browser::SetShutdownHandler(base::RepeatingCallback<bool()> handler) {
|
||||
[[AtomApplication sharedApplication] setShutdownHandler:std::move(handler)];
|
||||
}
|
||||
|
||||
|
|
|
@ -26,7 +26,8 @@ CookieChangeNotifier::~CookieChangeNotifier() = default;
|
|||
|
||||
base::CallbackListSubscription
|
||||
CookieChangeNotifier::RegisterCookieChangeCallback(
|
||||
const base::Callback<void(const net::CookieChangeInfo& change)>& cb) {
|
||||
const base::RepeatingCallback<void(const net::CookieChangeInfo& change)>&
|
||||
cb) {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
||||
return cookie_change_sub_list_.Add(cb);
|
||||
|
|
|
@ -25,7 +25,8 @@ class CookieChangeNotifier : public network::mojom::CookieChangeListener {
|
|||
|
||||
// Register callbacks that needs to notified on any cookie store changes.
|
||||
base::CallbackListSubscription RegisterCookieChangeCallback(
|
||||
const base::Callback<void(const net::CookieChangeInfo& change)>& cb);
|
||||
const base::RepeatingCallback<void(const net::CookieChangeInfo& change)>&
|
||||
cb);
|
||||
|
||||
private:
|
||||
void StartListening();
|
||||
|
|
|
@ -22,7 +22,7 @@ class ElectronDownloadManagerDelegate
|
|||
: public content::DownloadManagerDelegate {
|
||||
public:
|
||||
using CreateDownloadPathCallback =
|
||||
base::Callback<void(const base::FilePath&)>;
|
||||
base::RepeatingCallback<void(const base::FilePath&)>;
|
||||
|
||||
explicit ElectronDownloadManagerDelegate(content::DownloadManager* manager);
|
||||
~ElectronDownloadManagerDelegate() override;
|
||||
|
|
|
@ -29,14 +29,15 @@ class ElectronPermissionManager : public content::PermissionControllerDelegate {
|
|||
base::OnceCallback<void(blink::mojom::PermissionStatus)>;
|
||||
using StatusesCallback = base::OnceCallback<void(
|
||||
const std::vector<blink::mojom::PermissionStatus>&)>;
|
||||
using RequestHandler = base::Callback<void(content::WebContents*,
|
||||
content::PermissionType,
|
||||
StatusCallback,
|
||||
const base::Value&)>;
|
||||
using CheckHandler = base::Callback<bool(content::WebContents*,
|
||||
content::PermissionType,
|
||||
const GURL& requesting_origin,
|
||||
const base::Value&)>;
|
||||
using RequestHandler = base::RepeatingCallback<void(content::WebContents*,
|
||||
content::PermissionType,
|
||||
StatusCallback,
|
||||
const base::Value&)>;
|
||||
using CheckHandler =
|
||||
base::RepeatingCallback<bool(content::WebContents*,
|
||||
content::PermissionType,
|
||||
const GURL& requesting_origin,
|
||||
const base::Value&)>;
|
||||
|
||||
// Handler to dispatch permission requests in JS.
|
||||
void SetPermissionRequestHandler(const RequestHandler& handler);
|
||||
|
|
|
@ -115,7 +115,8 @@ void PowerObserverLinux::UnblockShutdown() {
|
|||
shutdown_lock_.reset();
|
||||
}
|
||||
|
||||
void PowerObserverLinux::SetShutdownHandler(base::Callback<bool()> handler) {
|
||||
void PowerObserverLinux::SetShutdownHandler(
|
||||
base::RepeatingCallback<bool()> handler) {
|
||||
// In order to delay system shutdown when e.preventDefault() is invoked
|
||||
// on a powerMonitor 'shutdown' event, we need an org.freedesktop.login1
|
||||
// shutdown delay lock. For more details see the "Taking Delay Locks"
|
||||
|
|
|
@ -22,7 +22,7 @@ class PowerObserverLinux {
|
|||
explicit PowerObserverLinux(base::PowerSuspendObserver* suspend_observer);
|
||||
~PowerObserverLinux();
|
||||
|
||||
void SetShutdownHandler(base::Callback<bool()> should_shutdown);
|
||||
void SetShutdownHandler(base::RepeatingCallback<bool()> should_shutdown);
|
||||
|
||||
private:
|
||||
void BlockSleep();
|
||||
|
|
|
@ -18,12 +18,12 @@
|
|||
NSCondition* handoffLock_;
|
||||
BOOL updateReceived_;
|
||||
BOOL userStoppedShutdown_;
|
||||
base::Callback<bool()> shouldShutdown_;
|
||||
base::RepeatingCallback<bool()> shouldShutdown_;
|
||||
}
|
||||
|
||||
+ (AtomApplication*)sharedApplication;
|
||||
|
||||
- (void)setShutdownHandler:(base::Callback<bool()>)handler;
|
||||
- (void)setShutdownHandler:(base::RepeatingCallback<bool()>)handler;
|
||||
- (void)registerURLHandler;
|
||||
|
||||
// Called when macOS itself is shutting down.
|
||||
|
|
|
@ -56,7 +56,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
|
|||
electron::Browser::Get()->Quit();
|
||||
}
|
||||
|
||||
- (void)setShutdownHandler:(base::Callback<bool()>)handler {
|
||||
- (void)setShutdownHandler:(base::RepeatingCallback<bool()>)handler {
|
||||
shouldShutdown_ = std::move(handler);
|
||||
}
|
||||
|
||||
|
|
|
@ -33,7 +33,8 @@ enum class ProtocolType {
|
|||
|
||||
using StartLoadingCallback = base::OnceCallback<void(gin::Arguments*)>;
|
||||
using ProtocolHandler =
|
||||
base::Callback<void(const network::ResourceRequest&, StartLoadingCallback)>;
|
||||
base::RepeatingCallback<void(const network::ResourceRequest&,
|
||||
StartLoadingCallback)>;
|
||||
|
||||
// scheme => (type, handler).
|
||||
using HandlersMap =
|
||||
|
|
|
@ -17,7 +17,8 @@
|
|||
|
||||
namespace electron {
|
||||
|
||||
typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
|
||||
typedef base::RepeatingCallback<void(const gfx::Rect&, const SkBitmap&)>
|
||||
OnPaintCallback;
|
||||
|
||||
class LayeredWindowUpdater : public viz::mojom::LayeredWindowUpdater {
|
||||
public:
|
||||
|
|
|
@ -52,8 +52,9 @@ class ElectronBeginFrameTimer;
|
|||
|
||||
class ElectronDelegatedFrameHostClient;
|
||||
|
||||
typedef base::Callback<void(const gfx::Rect&, const SkBitmap&)> OnPaintCallback;
|
||||
typedef base::Callback<void(const gfx::Rect&)> OnPopupPaintCallback;
|
||||
typedef base::RepeatingCallback<void(const gfx::Rect&, const SkBitmap&)>
|
||||
OnPaintCallback;
|
||||
typedef base::RepeatingCallback<void(const gfx::Rect&)> OnPopupPaintCallback;
|
||||
|
||||
class OffScreenRenderWidgetHostView : public content::RenderWidgetHostViewBase,
|
||||
public ui::CompositorDelegate,
|
||||
|
|
|
@ -37,7 +37,7 @@ AppIndicatorIconMenu::~AppIndicatorIconMenu() {
|
|||
|
||||
void AppIndicatorIconMenu::UpdateClickActionReplacementMenuItem(
|
||||
const char* label,
|
||||
const base::Closure& callback) {
|
||||
const base::RepeatingClosure& callback) {
|
||||
click_action_replacement_callback_ = callback;
|
||||
|
||||
if (click_action_replacement_menu_item_added_) {
|
||||
|
|
|
@ -29,8 +29,9 @@ class AppIndicatorIconMenu {
|
|||
// Sets a menu item at the top of |gtk_menu_| as a replacement for the app
|
||||
// indicator icon's click action. |callback| is called when the menu item
|
||||
// is activated.
|
||||
void UpdateClickActionReplacementMenuItem(const char* label,
|
||||
const base::Closure& callback);
|
||||
void UpdateClickActionReplacementMenuItem(
|
||||
const char* label,
|
||||
const base::RepeatingClosure& callback);
|
||||
|
||||
// Refreshes all the menu item labels and menu item checked/enabled states.
|
||||
void Refresh();
|
||||
|
@ -59,7 +60,7 @@ class AppIndicatorIconMenu {
|
|||
// Called when the click action replacement menu item is activated. When a
|
||||
// menu item from |menu_model_| is activated, MenuModel::ActivatedAt() is
|
||||
// invoked and is assumed to do any necessary processing.
|
||||
base::Closure click_action_replacement_callback_;
|
||||
base::RepeatingClosure click_action_replacement_callback_;
|
||||
|
||||
GtkWidget* gtk_menu_ = nullptr;
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ class TaskbarHost {
|
|||
std::string tooltip;
|
||||
gfx::Image icon;
|
||||
std::vector<std::string> flags;
|
||||
base::Closure clicked_callback;
|
||||
base::RepeatingClosure clicked_callback;
|
||||
|
||||
ThumbarButton();
|
||||
ThumbarButton(const ThumbarButton&);
|
||||
|
@ -66,7 +66,7 @@ class TaskbarHost {
|
|||
// Initialize the taskbar object.
|
||||
bool InitializeTaskbar();
|
||||
|
||||
using CallbackMap = std::map<int, base::Closure>;
|
||||
using CallbackMap = std::map<int, base::RepeatingClosure>;
|
||||
CallbackMap callback_map_;
|
||||
|
||||
std::vector<ThumbarButton> last_buttons_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue