diff --git a/browser/api/atom_api_window.cc b/browser/api/atom_api_window.cc index f1633f1ee33..0f4f870fde4 100644 --- a/browser/api/atom_api_window.cc +++ b/browser/api/atom_api_window.cc @@ -79,6 +79,10 @@ void Window::OnRendererResponsive() { Emit("responsive"); } +void Window::OnRendererCrashed() { + Emit("crashed"); +} + // static v8::Handle Window::New(const v8::Arguments &args) { v8::HandleScope scope; @@ -489,6 +493,13 @@ v8::Handle Window::GetProcessID(const v8::Arguments &args) { self->window_->GetWebContents()->GetRenderProcessHost()->GetID()); } +// static +v8::Handle Window::IsCrashed(const v8::Arguments &args) { + UNWRAP_WINDOW_AND_CHECK; + + return v8::Boolean::New(self->window_->GetWebContents()->IsCrashed()); +} + // static v8::Handle Window::LoadURL(const v8::Arguments &args) { UNWRAP_WINDOW_AND_CHECK; @@ -678,6 +689,7 @@ void Window::Initialize(v8::Handle target) { NODE_SET_PROTOTYPE_METHOD(t, "stop", Stop); NODE_SET_PROTOTYPE_METHOD(t, "getRoutingId", GetRoutingID); NODE_SET_PROTOTYPE_METHOD(t, "getProcessId", GetProcessID); + NODE_SET_PROTOTYPE_METHOD(t, "isCrashed", IsCrashed); NODE_SET_PROTOTYPE_METHOD(t, "loadUrl", LoadURL); NODE_SET_PROTOTYPE_METHOD(t, "getUrl", GetURL); diff --git a/browser/api/atom_api_window.h b/browser/api/atom_api_window.h index 67d347a9d3a..c9ffec21352 100644 --- a/browser/api/atom_api_window.h +++ b/browser/api/atom_api_window.h @@ -40,6 +40,7 @@ class Window : public EventEmitter, virtual void OnWindowBlur() OVERRIDE; virtual void OnRendererUnresponsive() OVERRIDE; virtual void OnRendererResponsive() OVERRIDE; + virtual void OnRendererCrashed() OVERRIDE; private: static v8::Handle New(const v8::Arguments &args); @@ -89,6 +90,7 @@ class Window : public EventEmitter, static v8::Handle Stop(const v8::Arguments &args); static v8::Handle GetRoutingID(const v8::Arguments &args); static v8::Handle GetProcessID(const v8::Arguments &args); + static v8::Handle IsCrashed(const v8::Arguments &args); // APIs for NavigationController. static v8::Handle LoadURL(const v8::Arguments &args);