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

Signature of OnCreateWindow has changed

Browse source
This commit is contained in:
Cheng Zhao 2017-01-23 17:44:42 +09:00 • committed by Kevin Sawicki
parent d8e9432b0d
commit c10eb73166
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/api/atom_api_app.cc
View file

@ -558,7 +558,7 @@ void App::OnCreateWindow(
const GURL& target_url, const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const std::vector<base::string16>& features, const std::vector<std::string>& features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body, const scoped_refptr<content::ResourceRequestBodyImpl>& body,
int render_process_id, int render_process_id,
int render_frame_id) { int render_frame_id) {

2
atom/browser/api/atom_api_app.h
View file

@ -53,7 +53,7 @@ class App : public AtomBrowserClient::Delegate,
const GURL& target_url, const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const std::vector<base::string16>& features, const std::vector<std::string>& features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body, const scoped_refptr<content::ResourceRequestBodyImpl>& body,
int render_process_id, int render_process_id,
int render_frame_id); int render_frame_id);

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

@ -392,7 +392,7 @@ void WebContents::OnCreateWindow(
const GURL& target_url, const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const std::vector<base::string16>& features, const std::vector<std::string>& features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body) { const scoped_refptr<content::ResourceRequestBodyImpl>& body) {
if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN) if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN)
Emit("-new-window", target_url, frame_name, disposition, features, body); Emit("-new-window", target_url, frame_name, disposition, features, body);

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

@ -184,7 +184,7 @@ class WebContents : public mate::TrackableObject<WebContents>,
const GURL& target_url, const GURL& target_url,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const std::vector<base::string16>& features, const std::vector<std::string>& features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body); const scoped_refptr<content::ResourceRequestBodyImpl>& body);
// Returns the web preferences of current WebContents. // Returns the web preferences of current WebContents.

2
atom/browser/atom_browser_client.cc
View file

@ -300,7 +300,7 @@ bool AtomBrowserClient::CanCreateWindow(
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::WebWindowFeatures& features, const blink::WebWindowFeatures& features,
const std::vector<base::string16>& additional_features, const std::vector<std::string>& additional_features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body, const scoped_refptr<content::ResourceRequestBodyImpl>& body,
bool user_gesture, bool user_gesture,
bool opener_suppressed, bool opener_suppressed,

2
atom/browser/atom_browser_client.h
View file

@ -88,7 +88,7 @@ class AtomBrowserClient : public brightray::BrowserClient,
const std::string& frame_name, const std::string& frame_name,
WindowOpenDisposition disposition, WindowOpenDisposition disposition,
const blink::WebWindowFeatures& features, const blink::WebWindowFeatures& features,
const std::vector<base::string16>& additional_features, const std::vector<std::string>& additional_features,
const scoped_refptr<content::ResourceRequestBodyImpl>& body, const scoped_refptr<content::ResourceRequestBodyImpl>& body,
bool user_gesture, bool user_gesture,
bool opener_suppressed, bool opener_suppressed,