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

Enable navigation from webview

Browse source
This commit is contained in:
Cheng Zhao 2014-10-24 18:06:32 +08:00
parent 6336edbe92
commit 4f43c41577
2 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
atom/browser/api/atom_api_web_contents.cc
View file

@ -58,6 +58,26 @@ WebContents::~WebContents() {
Destroy(); Destroy();
} }
content::WebContents* WebContents::OpenURLFromTab(
content::WebContents* source,
const content::OpenURLParams& params) {
if (params.disposition != CURRENT_TAB)
return NULL;
content::NavigationController::LoadURLParams load_url_params(params.url);
load_url_params.referrer = params.referrer;
load_url_params.transition_type = params.transition;
load_url_params.extra_headers = params.extra_headers;
load_url_params.should_replace_current_entry =
params.should_replace_current_entry;
load_url_params.is_renderer_initiated = params.is_renderer_initiated;
load_url_params.transferred_global_request_id =
params.transferred_global_request_id;
web_contents()->GetController().LoadURLWithParams(load_url_params);
return web_contents();
}
void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) { void WebContents::RenderViewDeleted(content::RenderViewHost* render_view_host) {
base::ListValue args; base::ListValue args;
args.AppendInteger(render_view_host->GetProcess()->GetID()); args.AppendInteger(render_view_host->GetProcess()->GetID());

5
atom/browser/api/atom_api_web_contents.h
View file

@ -83,6 +83,11 @@ class WebContents : public mate::EventEmitter,
virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder( virtual mate::ObjectTemplateBuilder GetObjectTemplateBuilder(
v8::Isolate* isolate) override; v8::Isolate* isolate) override;
// content::WebContentsDelegate:
virtual content::WebContents* OpenURLFromTab(
content::WebContents* source,
const content::OpenURLParams& params) override;
// content::WebContentsObserver: // content::WebContentsObserver:
virtual void RenderViewDeleted(content::RenderViewHost*) override; virtual void RenderViewDeleted(content::RenderViewHost*) override;
virtual void RenderProcessGone(base::TerminationStatus status) override; virtual void RenderProcessGone(base::TerminationStatus status) override;