github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add killed argument for webContents.on("crashed") and app.on("gpu-process-crashed") events

Browse Source
This commit is contained in:
Milan Burda
2016-09-17 17:00:45 -07:00
parent d4b204799d
commit 8567f79e67
5 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
atom/browser/api/atom_api_app.cc
View File

@@ -585,8 +585,9 @@ void App::SelectClientCertificate(
cert_request_info->client_certs[0].get());
}
void App::OnGpuProcessCrashed(base::TerminationStatus exit_code) {
Emit("gpu-process-crashed");
void App::OnGpuProcessCrashed(base::TerminationStatus status) {
Emit("gpu-process-crashed",
status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
}
base::FilePath App::GetPath(mate::Arguments* args, const std::string& name) {

2
atom/browser/api/atom_api_app.h
View File

@@ -102,7 +102,7 @@ class App : public AtomBrowserClient::Delegate,
std::unique_ptr<content::ClientCertificateDelegate> delegate) override;
// content::GpuDataManagerObserver:
void OnGpuProcessCrashed(base::TerminationStatus exit_code) override;
void OnGpuProcessCrashed(base::TerminationStatus status) override;
private:
// Get/Set the pre-defined path in PathService.

2
atom/browser/api/atom_api_web_contents.cc
View File

@@ -586,7 +586,7 @@ void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
}
void WebContents::RenderProcessGone(base::TerminationStatus status) {
Emit("crashed");
Emit("crashed", status == base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
}
void WebContents::PluginCrashed(const base::FilePath& plugin_path,