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

use content::ChildProcessTerminationInfo

Browse source
This commit is contained in:
Jeremy Apthorp 2018-09-14 17:11:49 -07:00 committed by Aleksei Kuzmin
parent 280421393e
commit 1c60f9e468
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
atom/browser/api/atom_api_app.cc
View file

@ -787,13 +787,15 @@ void App::BrowserChildProcessHostDisconnected(
ChildProcessDisconnected(base::GetProcId(data.handle)); ChildProcessDisconnected(base::GetProcId(data.handle));
} }
void App::BrowserChildProcessCrashed(const content::ChildProcessData& data, void App::BrowserChildProcessCrashed(
int exit_code) { const content::ChildProcessData& data,
const content::ChildProcessTerminationInfo& info) {
ChildProcessDisconnected(base::GetProcId(data.handle)); ChildProcessDisconnected(base::GetProcId(data.handle));
} }
void App::BrowserChildProcessKilled(const content::ChildProcessData& data, void App::BrowserChildProcessKilled(
int exit_code) { const content::ChildProcessData& data,
const content::ChildProcessTerminationInfo& info) {
ChildProcessDisconnected(base::GetProcId(data.handle)); ChildProcessDisconnected(base::GetProcId(data.handle));
} }

10
atom/browser/api/atom_api_app.h
View file

@ -162,10 +162,12 @@ class App : public AtomBrowserClient::Delegate,
const content::ChildProcessData& data) override; const content::ChildProcessData& data) override;
void BrowserChildProcessHostDisconnected( void BrowserChildProcessHostDisconnected(
const content::ChildProcessData& data) override; const content::ChildProcessData& data) override;
void BrowserChildProcessCrashed(const content::ChildProcessData& data, void BrowserChildProcessCrashed(
int exit_code) override; const content::ChildProcessData& data,
void BrowserChildProcessKilled(const content::ChildProcessData& data, const content::ChildProcessTerminationInfo& info) override;
int exit_code) override; void BrowserChildProcessKilled(
const content::ChildProcessData& data,
const content::ChildProcessTerminationInfo& info) override;
private: private:
void SetAppPath(const base::FilePath& app_path); void SetAppPath(const base::FilePath& app_path);

6
atom/browser/atom_browser_client.cc
View file

@ -557,9 +557,9 @@ void AtomBrowserClient::RenderProcessReady(content::RenderProcessHost* host) {
} }
} }
void AtomBrowserClient::RenderProcessExited(content::RenderProcessHost* host, void AtomBrowserClient::RenderProcessExited(
base::TerminationStatus status, content::RenderProcessHost* host,
int exit_code) { const content::ChildProcessTerminationInfo& info) {
auto host_pid = render_process_host_pids_.find(host->GetID()); auto host_pid = render_process_host_pids_.find(host->GetID());
if (host_pid != render_process_host_pids_.end()) { if (host_pid != render_process_host_pids_.end()) {
if (delegate_) { if (delegate_) {

6
atom/browser/atom_browser_client.h
View file

@ -123,9 +123,9 @@ class AtomBrowserClient : public brightray::BrowserClient,
// content::RenderProcessHostObserver: // content::RenderProcessHostObserver:
void RenderProcessHostDestroyed(content::RenderProcessHost* host) override; void RenderProcessHostDestroyed(content::RenderProcessHost* host) override;
void RenderProcessReady(content::RenderProcessHost* host) override; void RenderProcessReady(content::RenderProcessHost* host) override;
void RenderProcessExited(content::RenderProcessHost* host, void RenderProcessExited(
base::TerminationStatus status, content::RenderProcessHost* host,
int exit_code) override; const content::ChildProcessTerminationInfo& info) override;
bool HandleExternalProtocol( bool HandleExternalProtocol(
const GURL& url, const GURL& url,
content::ResourceRequestInfo::WebContentsGetter web_contents_getter, content::ResourceRequestInfo::WebContentsGetter web_contents_getter,