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

Move some APIs from Window to WebContents.

Browse source
This commit is contained in:
Cheng Zhao 2014-04-24 17:00:41 +08:00
parent 26e93e8798
commit 79babe858d
5 changed files with 67 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

43
atom/browser/api/atom_api_window.cc
View file

@ -336,34 +336,6 @@ mate::Handle<WebContents> Window::GetDevToolsWebContents(
return WebContents::Create(isolate, window_->GetDevToolsWebContents());
}
string16 Window::GetPageTitle() {
return window_->GetWebContents()->GetTitle();
}
bool Window::IsLoading() {
return window_->GetWebContents()->IsLoading();
}
bool Window::IsWaitingForResponse() {
return window_->GetWebContents()->IsWaitingForResponse();
}
void Window::Stop() {
window_->GetWebContents()->Stop();
}
int Window::GetRoutingID() {
return window_->GetWebContents()->GetRoutingID();
}
int Window::GetProcessID() {
return window_->GetWebContents()->GetRenderProcessHost()->GetID();
}
bool Window::IsCrashed() {
return window_->GetWebContents()->IsCrashed();
}
mate::Dictionary Window::GetDevTools(v8::Isolate* isolate) {
mate::Dictionary dict(mate::Dictionary::CreateEmpty(isolate));
content::WebContents* web_contents = window_->GetDevToolsWebContents();
@ -385,13 +357,6 @@ void Window::LoadURL(const GURL& url) {
controller.LoadURLWithParams(params);
}
GURL Window::GetURL() {
NavigationController& controller = window_->GetWebContents()->GetController();
if (!controller.GetActiveEntry())
return GURL();
return controller.GetActiveEntry()->GetVirtualURL();
}
bool Window::CanGoBack() {
return window_->GetWebContents()->GetController().CanGoBack();
}
@ -474,18 +439,10 @@ void Window::BuildPrototype(v8::Isolate* isolate,
.SetMethod("capturePage", &Window::CapturePage)
.SetMethod("getWebContents", &Window::GetWebContents)
.SetMethod("getDevToolsWebContents", &Window::GetDevToolsWebContents)
.SetMethod("getPageTitle", &Window::GetPageTitle)
.SetMethod("isLoading", &Window::IsLoading)
.SetMethod("isWaitingForResponse", &Window::IsWaitingForResponse)
.SetMethod("stop", &Window::Stop)
.SetMethod("getRoutingId", &Window::GetRoutingID)
.SetMethod("getProcessId", &Window::GetProcessID)
.SetMethod("isCrashed", &Window::IsCrashed)
.SetMethod("getDevTools", &Window::GetDevTools)
.SetMethod("executeJavaScriptInDevTools",
&Window::ExecuteJavaScriptInDevTools)
.SetMethod("loadUrl", &Window::LoadURL)
.SetMethod("getUrl", &Window::GetURL)
.SetMethod("canGoBack", &Window::CanGoBack)
.SetMethod("canGoForward", &Window::CanGoForward)
.SetMethod("canGoToOffset", &Window::CanGoToOffset)