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

refactor: add EmitWarning(v8::Isolate*) helper (#43722)

Browse source 
* refactor: add EmitWarning(Isolate*, ...) warning

* chore: remove EmitWarning(node::Environment*, ...)

* chore: add code comments

* fixup! refactor: add EmitWarning(Isolate*, ...) warning

* chore: remove unused node #includes
This commit is contained in:
Charles Kerr 2024-09-16 15:53:04 -05:00 • committed by GitHub
parent 7d4f202c1c
commit 05dfd14913
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 72 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/browser/usb/usb_chooser_controller.cc
View file

@ -23,8 +23,7 @@
#include "shell/common/gin_converters/content_converter.h"
#include "shell/common/gin_converters/frame_converter.h"
#include "shell/common/gin_converters/usb_device_info_converter.h"
#include "shell/common/node_includes.h"
#include "shell/common/process_util.h"
#include "shell/common/node_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "url/gurl.h"
@ -91,10 +90,9 @@ void UsbChooserController::OnDeviceChosen(gin::Arguments* args) {
if (device_info) {
RunCallback(device_info->Clone());
} else {
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
node::Environment* env = node::Environment::GetCurrent(isolate);
EmitWarning(env, "The device id " + device_id + " was not found.",
"UnknownUsbDeviceId");
util::EmitWarning(
base::StrCat({"The device id ", device_id, " was not found."}),
"UnknownUsbDeviceId");
RunCallback(/*device_info=*/nullptr);
}
}
@ -118,7 +116,7 @@ void UsbChooserController::GotUsbDeviceList(
if (session) {
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope scope(isolate);
v8::HandleScope handle_scope{isolate};
// "select-usb-device" should respect |filters|.
std::erase_if(devices, [this](const auto& device_info) {