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

fix: build SetCrashKeyGW without tray on Windows (#30437)

Browse source
This commit is contained in:
Keeley Hammond 2021-08-06 14:04:19 -07:00 committed by GitHub
parent d783e944d3
commit 6a9cada98c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
shell/common/crash_keys.cc
View file

@ -41,13 +41,15 @@
#include "shell/browser/api/electron_api_service_worker_context.h" #include "shell/browser/api/electron_api_service_worker_context.h"
#include "shell/browser/api/electron_api_session.h" #include "shell/browser/api/electron_api_session.h"
#include "shell/browser/api/electron_api_system_preferences.h" #include "shell/browser/api/electron_api_system_preferences.h"
#include "shell/browser/api/electron_api_tray.h"
#include "shell/browser/api/electron_api_url_loader.h" #include "shell/browser/api/electron_api_url_loader.h"
#include "shell/browser/api/electron_api_web_contents.h" #include "shell/browser/api/electron_api_web_contents.h"
#include "shell/browser/api/electron_api_web_frame_main.h" #include "shell/browser/api/electron_api_web_frame_main.h"
#include "shell/browser/api/electron_api_web_request.h" #include "shell/browser/api/electron_api_web_request.h"
#include "shell/browser/api/event.h" #include "shell/browser/api/event.h"
#include "shell/common/api/electron_api_native_image.h" #include "shell/common/api/electron_api_native_image.h"
#if !defined(OS_WIN)
#include "shell/browser/api/electron_api_tray.h"
#endif
namespace electron { namespace electron {
@ -205,6 +207,10 @@ void SetCrashKeyForGinWrappable(gin::WrapperInfo* info) {
else if (info == &electron::api::DesktopCapturer::kWrapperInfo) else if (info == &electron::api::DesktopCapturer::kWrapperInfo)
crash_location = "DesktopCapturer"; crash_location = "DesktopCapturer";
#endif #endif
#if !defined(OS_WIN)
else if (info == &electron::api::Tray::kWrapperInfo)
crash_location = "Tray";
#endif // OS_WIN
else if (info == &electron::api::NetLog::kWrapperInfo) else if (info == &electron::api::NetLog::kWrapperInfo)
crash_location = "NetLog"; crash_location = "NetLog";
else if (info == &electron::api::NativeImage::kWrapperInfo) else if (info == &electron::api::NativeImage::kWrapperInfo)
@ -235,8 +241,6 @@ void SetCrashKeyForGinWrappable(gin::WrapperInfo* info) {
crash_location = "GlobalShortcut"; crash_location = "GlobalShortcut";
else if (info == &electron::api::InAppPurchase::kWrapperInfo) else if (info == &electron::api::InAppPurchase::kWrapperInfo)
crash_location = "InAppPurchase"; crash_location = "InAppPurchase";
else if (info == &electron::api::Tray::kWrapperInfo)
crash_location = "Tray";
else if (info == &electron::api::DataPipeHolder::kWrapperInfo) else if (info == &electron::api::DataPipeHolder::kWrapperInfo)
crash_location = "DataPipeHolder"; crash_location = "DataPipeHolder";
else if (info == &electron::api::AutoUpdater::kWrapperInfo) else if (info == &electron::api::AutoUpdater::kWrapperInfo)