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

fix: app.setLoginItemSettings error getting swallowed by gin conversion (#41647)

Browse source 
* fix: errors getting swallowed by gin conversion

* fix: Windows build

* test: re-enable disabled test
This commit is contained in:
Shelley Vohr 2024-03-22 14:00:21 +01:00 • committed by GitHub
parent a32705fd30
commit 707b9a58cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 211 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shell/browser/browser_linux.cc
View file

@ -11,9 +11,11 @@
#include "base/environment.h"
#include "base/process/launch.h"
#include "electron/electron_version.h"
#include "shell/browser/javascript_environment.h"
#include "shell/browser/native_window.h"
#include "shell/browser/window_list.h"
#include "shell/common/application_info.h"
#include "shell/common/gin_converters/login_item_settings_converter.h"
#include "shell/common/thread_restrictions.h"
#if BUILDFLAG(IS_LINUX)
@ -138,9 +140,10 @@ bool Browser::SetBadgeCount(std::optional<int> count) {
void Browser::SetLoginItemSettings(LoginItemSettings settings) {}
Browser::LoginItemSettings Browser::GetLoginItemSettings(
v8::Local<v8::Value> Browser::GetLoginItemSettings(
const LoginItemSettings& options) {
return LoginItemSettings();
LoginItemSettings settings;
return gin::ConvertToV8(JavascriptEnvironment::GetIsolate(), settings);
}
std::string Browser::GetExecutableFileVersion() const {