Add partial APIs for WebContents and NavigationController.
This commit is contained in:
parent
257e439efb
commit
d06472b092
4 changed files with 263 additions and 61 deletions
|
@ -14,21 +14,26 @@
|
|||
#include "ui/gfx/size.h"
|
||||
|
||||
using content::V8ValueConverter;
|
||||
using content::NavigationController;
|
||||
using node::ObjectWrap;
|
||||
|
||||
namespace atom {
|
||||
|
||||
namespace api {
|
||||
|
||||
namespace {
|
||||
|
||||
// Converts string16 to V8 String.
|
||||
v8::Handle<v8::String> UTF16ToV8String(const string16& s) {
|
||||
return v8::String::New(reinterpret_cast<const uint16_t*>(s.data()), s.size());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Window::Window(v8::Handle<v8::Object> wrapper, base::DictionaryValue* options)
|
||||
: EventEmitter(wrapper),
|
||||
window_(NativeWindow::Create(AtomBrowserContext::Get(), options)) {
|
||||
window_->InitFromOptions(options);
|
||||
window_->GetWebContents()->GetController().LoadURL(
|
||||
GURL("https://github.com"),
|
||||
content::Referrer(),
|
||||
content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
||||
std::string());
|
||||
}
|
||||
|
||||
Window::~Window() {
|
||||
|
@ -312,6 +317,163 @@ v8::Handle<v8::Value> Window::CloseDevTools(const v8::Arguments &args) {
|
|||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::GetPageTitle(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
string16 title = self->window_->GetWebContents()->GetTitle();
|
||||
|
||||
return UTF16ToV8String(title);
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::IsLoading(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
return v8::Boolean::New(self->window_->GetWebContents()->IsLoading());
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::IsWaitingForResponse(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
return v8::Boolean::New(
|
||||
self->window_->GetWebContents()->IsWaitingForResponse());
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::Stop(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
self->window_->GetWebContents()->Stop();
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::LoadURL(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
if (args.Length() < 1 || !args[0]->IsString())
|
||||
return node::ThrowTypeError("Bad argument");
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.LoadURL(GURL(*v8::String::Utf8Value(args[0])),
|
||||
content::Referrer(),
|
||||
content::PAGE_TRANSITION_AUTO_TOPLEVEL,
|
||||
std::string());
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::CanGoBack(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
|
||||
return v8::Boolean::New(controller.CanGoBack());
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::CanGoForward(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
|
||||
return v8::Boolean::New(controller.CanGoForward());
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::CanGoToOffset(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
if (args.Length() < 1)
|
||||
return node::ThrowTypeError("Bad argument");
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
int offset = args[0]->IntegerValue();
|
||||
|
||||
return v8::Boolean::New(controller.CanGoToOffset(offset));
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::GoBack(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.GoBack();
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::GoForward(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.GoForward();
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::GoToIndex(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
if (args.Length() < 1)
|
||||
return node::ThrowTypeError("Bad argument");
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.GoToIndex(args[0]->IntegerValue());
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::GoToOffset(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
if (args.Length() < 1)
|
||||
return node::ThrowTypeError("Bad argument");
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.GoToOffset(args[0]->IntegerValue());
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::Reload(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.Reload(args[0]->IsBoolean() ? args[0]->BooleanValue(): false);
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
v8::Handle<v8::Value> Window::ReloadIgnoringCache(const v8::Arguments &args) {
|
||||
Window* self = ObjectWrap::Unwrap<Window>(args.This());
|
||||
|
||||
NavigationController& controller =
|
||||
self->window_->GetWebContents()->GetController();
|
||||
controller.ReloadIgnoringCache(
|
||||
args[0]->IsBoolean() ? args[0]->BooleanValue(): false);
|
||||
|
||||
return v8::Undefined();
|
||||
}
|
||||
|
||||
// static
|
||||
void Window::Initialize(v8::Handle<v8::Object> target) {
|
||||
v8::HandleScope scope;
|
||||
|
@ -347,6 +509,22 @@ void Window::Initialize(v8::Handle<v8::Object> target) {
|
|||
NODE_SET_PROTOTYPE_METHOD(t, "showDevTools", ShowDevTools);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "closeDevTools", CloseDevTools);
|
||||
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "getPageTitle", GetPageTitle);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "isLoading", IsLoading);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "isWaitingForResponse", IsWaitingForResponse);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "stop", Stop);
|
||||
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "loadURL", LoadURL);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "canGoBack", CanGoBack);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "canGoForward", CanGoForward);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "canGoToOffset", CanGoToOffset);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "goBack", GoBack);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "goForward", GoForward);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "goToIndex", GoToIndex);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "goToOffset", GoToOffset);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "reload", Reload);
|
||||
NODE_SET_PROTOTYPE_METHOD(t, "reloadIgnoringCache", ReloadIgnoringCache);
|
||||
|
||||
target->Set(v8::String::NewSymbol("Window"), t->GetFunction());
|
||||
}
|
||||
|
||||
|
|
|
@ -60,6 +60,24 @@ class Window : public EventEmitter {
|
|||
static v8::Handle<v8::Value> ShowDevTools(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> CloseDevTools(const v8::Arguments &args);
|
||||
|
||||
// APIs for WebContents.
|
||||
static v8::Handle<v8::Value> GetPageTitle(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> IsLoading(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> IsWaitingForResponse(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> Stop(const v8::Arguments &args);
|
||||
|
||||
// APIs for NavigationController.
|
||||
static v8::Handle<v8::Value> LoadURL(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> CanGoBack(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> CanGoForward(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> CanGoToOffset(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> GoBack(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> GoForward(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> GoToIndex(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> GoToOffset(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> Reload(const v8::Arguments &args);
|
||||
static v8::Handle<v8::Value> ReloadIgnoringCache(const v8::Arguments &args);
|
||||
|
||||
scoped_ptr<NativeWindow> window_;
|
||||
|
||||
DISALLOW_COPY_AND_ASSIGN(Window);
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
<html>
|
||||
<head>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<title>Title</title>
|
||||
</head>
|
||||
<body>
|
||||
Content
|
||||
</body>
|
||||
</html>
|
|
@ -5,8 +5,5 @@ var mainWindow = null;
|
|||
|
||||
atom.browserMainParts.preMainMessageLoopRun = function() {
|
||||
mainWindow = new Window({ width: 800, height: 600 });
|
||||
|
||||
setTimeout(function() {
|
||||
mainWindow.destroy();
|
||||
}, 10000);
|
||||
mainWindow.loadURL('file://' + __dirname + '/index.html');
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue