diff --git a/browser/api/atom_api_window.cc b/browser/api/atom_api_window.cc index ddc5d5cf07e1..768198f3e48b 100644 --- a/browser/api/atom_api_window.cc +++ b/browser/api/atom_api_window.cc @@ -493,16 +493,6 @@ v8::Handle Window::IsWebViewFocused(const v8::Arguments& args) { return ToV8Value(self->window_->IsWebViewFocused()); } -// static -v8::Handle Window::RestartHangMonitorTimeout( - const v8::Arguments &args) { - UNWRAP_WINDOW_AND_CHECK; - - self->window_->RestartHangMonitorTimeout(); - - return v8::Undefined(); -} - // static v8::Handle Window::CapturePage(const v8::Arguments& args) { UNWRAP_WINDOW_AND_CHECK; @@ -759,9 +749,6 @@ void Window::Initialize(v8::Handle target) { NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView); NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView); NODE_SET_PROTOTYPE_METHOD(t, "isWebViewFocused", IsWebViewFocused); - NODE_SET_PROTOTYPE_METHOD(t, - "restartHangMonitorTimeout", - RestartHangMonitorTimeout); NODE_SET_PROTOTYPE_METHOD(t, "capturePage", CapturePage); NODE_SET_PROTOTYPE_METHOD(t, "getPageTitle", GetPageTitle); diff --git a/browser/api/atom_api_window.h b/browser/api/atom_api_window.h index 92c470203e7a..4558bf69d969 100644 --- a/browser/api/atom_api_window.h +++ b/browser/api/atom_api_window.h @@ -88,8 +88,6 @@ class Window : public EventEmitter, static v8::Handle FocusOnWebView(const v8::Arguments &args); static v8::Handle BlurWebView(const v8::Arguments &args); static v8::Handle IsWebViewFocused(const v8::Arguments& args); - static v8::Handle RestartHangMonitorTimeout( - const v8::Arguments &args); static v8::Handle CapturePage(const v8::Arguments& args); // APIs for WebContents. diff --git a/browser/native_window.cc b/browser/native_window.cc index b85ca5cb939c..09ed8237ba98 100644 --- a/browser/native_window.cc +++ b/browser/native_window.cc @@ -188,10 +188,6 @@ bool NativeWindow::IsWebViewFocused() { return GetWebContents()->GetRenderViewHost()->GetView()->HasFocus(); } -void NativeWindow::RestartHangMonitorTimeout() { - GetWebContents()->GetRenderViewHost()->RestartHangMonitorTimeout(); -} - bool NativeWindow::SetIcon(const std::string& str_path) { base::FilePath path = base::FilePath::FromUTF8Unsafe(str_path); diff --git a/browser/native_window.h b/browser/native_window.h index 03103f118259..40ce3ee3fb1e 100644 --- a/browser/native_window.h +++ b/browser/native_window.h @@ -108,10 +108,11 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate, virtual void CloseDevTools(); virtual bool IsDevToolsOpened(); virtual void InspectElement(int x, int y); + virtual void FocusOnWebView(); virtual void BlurWebView(); virtual bool IsWebViewFocused(); - virtual void RestartHangMonitorTimeout(); + virtual bool SetIcon(const std::string& path); // Returns the process handle of render process, useful for killing the diff --git a/docs/api/browser/browser-window.md b/docs/api/browser/browser-window.md index eb9f6dd967de..3cb755119963 100644 --- a/docs/api/browser/browser-window.md +++ b/docs/api/browser/browser-window.md @@ -288,8 +288,6 @@ Starts inspecting element at position (`x`, `y`). ### BrowserWindow.blurWebView() -### BrowserWindow.restartHangMonitorTimeout() - ### BrowserWindow.capturePage([rect, ]callback) * `rect` Object - The area of page to be captured