From c10eb7316673b0afa39e41ced27140aa7bab6a02 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 23 Jan 2017 17:44:42 +0900 Subject: [PATCH] Signature of OnCreateWindow has changed --- atom/browser/api/atom_api_app.cc | 2 +- atom/browser/api/atom_api_app.h | 2 +- atom/browser/api/atom_api_web_contents.cc | 2 +- atom/browser/api/atom_api_web_contents.h | 2 +- atom/browser/atom_browser_client.cc | 2 +- atom/browser/atom_browser_client.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/atom/browser/api/atom_api_app.cc b/atom/browser/api/atom_api_app.cc index 99cd5ffa8b1..caaee9d25cb 100644 --- a/atom/browser/api/atom_api_app.cc +++ b/atom/browser/api/atom_api_app.cc @@ -558,7 +558,7 @@ void App::OnCreateWindow( const GURL& target_url, const std::string& frame_name, WindowOpenDisposition disposition, - const std::vector& features, + const std::vector& features, const scoped_refptr& body, int render_process_id, int render_frame_id) { diff --git a/atom/browser/api/atom_api_app.h b/atom/browser/api/atom_api_app.h index 2bd977f46b0..c7e62927c59 100644 --- a/atom/browser/api/atom_api_app.h +++ b/atom/browser/api/atom_api_app.h @@ -53,7 +53,7 @@ class App : public AtomBrowserClient::Delegate, const GURL& target_url, const std::string& frame_name, WindowOpenDisposition disposition, - const std::vector& features, + const std::vector& features, const scoped_refptr& body, int render_process_id, int render_frame_id); diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index a8f864c775b..6b448b53350 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -392,7 +392,7 @@ void WebContents::OnCreateWindow( const GURL& target_url, const std::string& frame_name, WindowOpenDisposition disposition, - const std::vector& features, + const std::vector& features, const scoped_refptr& body) { if (type_ == BROWSER_WINDOW || type_ == OFF_SCREEN) Emit("-new-window", target_url, frame_name, disposition, features, body); diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index 22f6b8775f9..385aa63f49a 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -184,7 +184,7 @@ class WebContents : public mate::TrackableObject, const GURL& target_url, const std::string& frame_name, WindowOpenDisposition disposition, - const std::vector& features, + const std::vector& features, const scoped_refptr& body); // Returns the web preferences of current WebContents. diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 97a13fe6d6b..bad2999ed6d 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -300,7 +300,7 @@ bool AtomBrowserClient::CanCreateWindow( const std::string& frame_name, WindowOpenDisposition disposition, const blink::WebWindowFeatures& features, - const std::vector& additional_features, + const std::vector& additional_features, const scoped_refptr& body, bool user_gesture, bool opener_suppressed, diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 0956158717b..c2a7d5edd0f 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -88,7 +88,7 @@ class AtomBrowserClient : public brightray::BrowserClient, const std::string& frame_name, WindowOpenDisposition disposition, const blink::WebWindowFeatures& features, - const std::vector& additional_features, + const std::vector& additional_features, const scoped_refptr& body, bool user_gesture, bool opener_suppressed,