diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 685d2700d79a..ca994edf0d15 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -319,6 +319,7 @@ bool AtomBrowserClient::CanCreateWindow( WindowOpenDisposition disposition, const blink::WebWindowFeatures& features, const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, content::ResourceContext* context, diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 37ed898be9ce..208855bc7228 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -13,6 +13,8 @@ #include "brightray/browser/browser_client.h" #include "content/public/browser/render_process_host_observer.h" +using content::ResourceRequestBodyImpl; + namespace content { class QuotaPermissionContext; class ClientCertificateDelegate; @@ -89,6 +91,7 @@ class AtomBrowserClient : public brightray::BrowserClient, WindowOpenDisposition disposition, const blink::WebWindowFeatures& features, const std::vector& additional_features, + const scoped_refptr& body, bool user_gesture, bool opener_suppressed, content::ResourceContext* context, diff --git a/atom/common/chrome_version.h b/atom/common/chrome_version.h index 0363943d53bb..9fbacf4e7371 100644 --- a/atom/common/chrome_version.h +++ b/atom/common/chrome_version.h @@ -8,7 +8,7 @@ #ifndef ATOM_COMMON_CHROME_VERSION_H_ #define ATOM_COMMON_CHROME_VERSION_H_ -#define CHROME_VERSION_STRING "53.0.2785.113" +#define CHROME_VERSION_STRING "53.0.2785.143" #define CHROME_VERSION "v" CHROME_VERSION_STRING #endif // ATOM_COMMON_CHROME_VERSION_H_ diff --git a/script/lib/config.py b/script/lib/config.py index b98bf4244982..88dee3442df4 100644 --- a/script/lib/config.py +++ b/script/lib/config.py @@ -9,7 +9,7 @@ import sys BASE_URL = os.getenv('LIBCHROMIUMCONTENT_MIRROR') or \ 'https://s3.amazonaws.com/github-janky-artifacts/libchromiumcontent' LIBCHROMIUMCONTENT_COMMIT = os.getenv('LIBCHROMIUMCONTENT_COMMIT') or \ - '82751b122d7f5cbedee5c662acc8cd1f1be8036d' + '76bb29da18cbeec0051e0690bc1b95e78034a422' PLATFORM = { 'cygwin': 'win32', diff --git a/vendor/brightray b/vendor/brightray index bb35b4ada1ab..86a5d053234a 160000 --- a/vendor/brightray +++ b/vendor/brightray @@ -1 +1 @@ -Subproject commit bb35b4ada1ab9285251087656a9fdef488796509 +Subproject commit 86a5d053234a3eb9b2df47087738ab0b68ac1e25