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

Remove the RestartHangMonitorTimeout API, which is useless now.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-09 14:17:56 +08:00
parent 2c672052e6
commit cb73a3c572
5 changed files with 2 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
browser/api/atom_api_window.cc
View file

@ -493,16 +493,6 @@ v8::Handle<v8::Value> Window::IsWebViewFocused(const v8::Arguments& args) {
return ToV8Value(self->window_->IsWebViewFocused()); return ToV8Value(self->window_->IsWebViewFocused());
} }
// static
v8::Handle<v8::Value> Window::RestartHangMonitorTimeout(
const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK;
self->window_->RestartHangMonitorTimeout();
return v8::Undefined();
}
// static // static
v8::Handle<v8::Value> Window::CapturePage(const v8::Arguments& args) { v8::Handle<v8::Value> Window::CapturePage(const v8::Arguments& args) {
UNWRAP_WINDOW_AND_CHECK; UNWRAP_WINDOW_AND_CHECK;
@ -759,9 +749,6 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView); NODE_SET_PROTOTYPE_METHOD(t, "focusOnWebView", FocusOnWebView);
NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView); NODE_SET_PROTOTYPE_METHOD(t, "blurWebView", BlurWebView);
NODE_SET_PROTOTYPE_METHOD(t, "isWebViewFocused", IsWebViewFocused); 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, "capturePage", CapturePage);
NODE_SET_PROTOTYPE_METHOD(t, "getPageTitle", GetPageTitle); NODE_SET_PROTOTYPE_METHOD(t, "getPageTitle", GetPageTitle);

2
browser/api/atom_api_window.h
View file

@ -88,8 +88,6 @@ class Window : public EventEmitter,
static v8::Handle<v8::Value> FocusOnWebView(const v8::Arguments &args); static v8::Handle<v8::Value> FocusOnWebView(const v8::Arguments &args);
static v8::Handle<v8::Value> BlurWebView(const v8::Arguments &args); static v8::Handle<v8::Value> BlurWebView(const v8::Arguments &args);
static v8::Handle<v8::Value> IsWebViewFocused(const v8::Arguments& args); static v8::Handle<v8::Value> IsWebViewFocused(const v8::Arguments& args);
static v8::Handle<v8::Value> RestartHangMonitorTimeout(
const v8::Arguments &args);
static v8::Handle<v8::Value> CapturePage(const v8::Arguments& args); static v8::Handle<v8::Value> CapturePage(const v8::Arguments& args);
// APIs for WebContents. // APIs for WebContents.

4
browser/native_window.cc
View file

@ -188,10 +188,6 @@ bool NativeWindow::IsWebViewFocused() {
return GetWebContents()->GetRenderViewHost()->GetView()->HasFocus(); return GetWebContents()->GetRenderViewHost()->GetView()->HasFocus();
} }
void NativeWindow::RestartHangMonitorTimeout() {
GetWebContents()->GetRenderViewHost()->RestartHangMonitorTimeout();
}
bool NativeWindow::SetIcon(const std::string& str_path) { bool NativeWindow::SetIcon(const std::string& str_path) {
base::FilePath path = base::FilePath::FromUTF8Unsafe(str_path); base::FilePath path = base::FilePath::FromUTF8Unsafe(str_path);

3
browser/native_window.h
View file

@ -108,10 +108,11 @@ class NativeWindow : public brightray::DefaultWebContentsDelegate,
virtual void CloseDevTools(); virtual void CloseDevTools();
virtual bool IsDevToolsOpened(); virtual bool IsDevToolsOpened();
virtual void InspectElement(int x, int y); virtual void InspectElement(int x, int y);
virtual void FocusOnWebView(); virtual void FocusOnWebView();
virtual void BlurWebView(); virtual void BlurWebView();
virtual bool IsWebViewFocused(); virtual bool IsWebViewFocused();
virtual void RestartHangMonitorTimeout();
virtual bool SetIcon(const std::string& path); virtual bool SetIcon(const std::string& path);
// Returns the process handle of render process, useful for killing the // Returns the process handle of render process, useful for killing the

2
docs/api/browser/browser-window.md
View file

@ -288,8 +288,6 @@ Starts inspecting element at position (`x`, `y`).
### BrowserWindow.blurWebView() ### BrowserWindow.blurWebView()
### BrowserWindow.restartHangMonitorTimeout()
### BrowserWindow.capturePage([rect, ]callback) ### BrowserWindow.capturePage([rect, ]callback)
* `rect` Object - The area of page to be captured * `rect` Object - The area of page to be captured