diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index d278f0396672..691fcf92c220 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -653,8 +653,7 @@ void Session::SetPermissionRequestHandler(v8::Local val, blink::PermissionType permission_type, ElectronPermissionManager::StatusCallback callback, const base::Value& details) { - handler->Run(web_contents, permission_type, - base::AdaptCallbackForRepeating(std::move(callback)), + handler->Run(web_contents, permission_type, std::move(callback), details); }, base::Owned(std::move(handler)))); diff --git a/shell/browser/bluetooth/electron_bluetooth_delegate.cc b/shell/browser/bluetooth/electron_bluetooth_delegate.cc index 1eece6ad4858..b95b3f351aa5 100644 --- a/shell/browser/bluetooth/electron_bluetooth_delegate.cc +++ b/shell/browser/bluetooth/electron_bluetooth_delegate.cc @@ -179,9 +179,9 @@ void ElectronBluetoothDelegate::ShowDevicePairPrompt( } permission_manager->CheckBluetoothDevicePair( - details, base::AdaptCallbackForRepeating(base::BindOnce( - &ElectronBluetoothDelegate::OnDevicePairPromptResponse, - weak_factory_.GetWeakPtr(), std::move(callback)))); + details, + base::BindOnce(&ElectronBluetoothDelegate::OnDevicePairPromptResponse, + weak_factory_.GetWeakPtr(), std::move(callback))); } } diff --git a/shell/browser/hid/hid_chooser_controller.cc b/shell/browser/hid/hid_chooser_controller.cc index 11bb87a6fbfa..d5f5aeee7979 100644 --- a/shell/browser/hid/hid_chooser_controller.cc +++ b/shell/browser/hid/hid_chooser_controller.cc @@ -247,9 +247,8 @@ void HidChooserController::OnGotDevices( .Build(); prevent_default = session->Emit("select-hid-device", details, - base::AdaptCallbackForRepeating( - base::BindOnce(&HidChooserController::OnDeviceChosen, - weak_factory_.GetWeakPtr()))); + base::BindRepeating(&HidChooserController::OnDeviceChosen, + weak_factory_.GetWeakPtr())); } if (!prevent_default) { RunCallback({}); diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc index d0aae7faa177..f15722b22336 100644 --- a/shell/browser/serial/serial_chooser_controller.cc +++ b/shell/browser/serial/serial_chooser_controller.cc @@ -156,11 +156,10 @@ void SerialChooserController::OnGetDevices( bool prevent_default = false; api::Session* session = GetSession(); if (session) { - prevent_default = - session->Emit("select-serial-port", ports_, web_contents(), - base::AdaptCallbackForRepeating(base::BindOnce( - &SerialChooserController::OnDeviceChosen, - weak_factory_.GetWeakPtr()))); + prevent_default = session->Emit( + "select-serial-port", ports_, web_contents(), + base::BindRepeating(&SerialChooserController::OnDeviceChosen, + weak_factory_.GetWeakPtr())); } if (!prevent_default) { RunCallback(/*port=*/nullptr); diff --git a/shell/browser/usb/usb_chooser_controller.cc b/shell/browser/usb/usb_chooser_controller.cc index ae560d7ed375..ccee9919d8c0 100644 --- a/shell/browser/usb/usb_chooser_controller.cc +++ b/shell/browser/usb/usb_chooser_controller.cc @@ -126,9 +126,8 @@ void UsbChooserController::GotUsbDeviceList( prevent_default = session->Emit("select-usb-device", details, - base::AdaptCallbackForRepeating( - base::BindOnce(&UsbChooserController::OnDeviceChosen, - weak_factory_.GetWeakPtr()))); + base::BindRepeating(&UsbChooserController::OnDeviceChosen, + weak_factory_.GetWeakPtr())); } if (!prevent_default) { RunCallback(/*device_info=*/nullptr);