Enable overriding UA strings.

This commit is contained in:
Cheng Zhao 2013-12-05 10:08:11 +08:00
parent 121163f9ca
commit 02bbf07d3a

View file

@ -576,16 +576,17 @@ v8::Handle<v8::Value> Window::IsCrashed(const v8::Arguments &args) {
v8::Handle<v8::Value> Window::LoadURL(const v8::Arguments &args) { v8::Handle<v8::Value> Window::LoadURL(const v8::Arguments &args) {
UNWRAP_WINDOW_AND_CHECK; UNWRAP_WINDOW_AND_CHECK;
std::string url; GURL url;
if (!FromV8Arguments(args, &url)) if (!FromV8Arguments(args, &url))
return node::ThrowTypeError("Bad argument"); return node::ThrowTypeError("Bad argument");
NavigationController& controller = NavigationController& controller =
self->window_->GetWebContents()->GetController(); self->window_->GetWebContents()->GetController();
controller.LoadURL(GURL(url),
content::Referrer(), content::NavigationController::LoadURLParams params(url);
content::PAGE_TRANSITION_AUTO_TOPLEVEL, params.transition_type = content::PAGE_TRANSITION_TYPED;
std::string()); params.override_user_agent = content::NavigationController::UA_OVERRIDE_TRUE;
controller.LoadURLWithParams(params);
return v8::Undefined(); return v8::Undefined();
} }
@ -596,9 +597,9 @@ v8::Handle<v8::Value> Window::GetURL(const v8::Arguments &args) {
NavigationController& controller = NavigationController& controller =
self->window_->GetWebContents()->GetController(); self->window_->GetWebContents()->GetController();
std::string url; GURL url;
if (controller.GetActiveEntry()) if (controller.GetActiveEntry())
url = controller.GetActiveEntry()->GetVirtualURL().spec(); url = controller.GetActiveEntry()->GetVirtualURL();
return ToV8Value(url); return ToV8Value(url);
} }