From 2d14a0e90d98e95a8e7a0e8915ad8361dec0b913 Mon Sep 17 00:00:00 2001 From: Nitish Sakhawalkar Date: Wed, 15 May 2019 15:04:23 -0700 Subject: [PATCH] Update changed APIs/deps Use brotli by default (https://chromium.googlesource.com/chromium/src/+/36d58dd325f958ed2b25b870f16574eaa309e342) Update Mac ui headers (https://chromium.googlesource.com/chromium/src/+/897636c9f85adf2f0e06d5f0f7b8de0d1e2e3d26) Update AtomBrowserClient::HandleExternalProtocol API (https://chromium.googlesource.com/chromium/src/+/cb656e1fd16bdb5f28142bea5178dff2db86cffe) --- atom/browser/atom_browser_client.cc | 2 -- atom/browser/atom_browser_client.h | 2 -- atom/browser/native_window_mac.mm | 2 +- atom/browser/net/system_network_context_manager.cc | 3 +-- atom/browser/ui/cocoa/atom_ns_window.h | 2 +- atom/browser/ui/cocoa/atom_ns_window_delegate.h | 2 +- atom/browser/ui/cocoa/atom_ns_window_delegate.mm | 2 +- 7 files changed, 5 insertions(+), 10 deletions(-) diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index 027150657ede..736312ce4db5 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -827,8 +827,6 @@ bool AtomBrowserClient::HandleExternalProtocol( bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - const std::string& method, - const net::HttpRequestHeaders& headers, network::mojom::URLLoaderFactoryRequest* factory_request, // clang-format off network::mojom::URLLoaderFactory*& out_factory) { // NOLINT diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 664d6ccfa03a..cbd9972d4464 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -182,8 +182,6 @@ class AtomBrowserClient : public content::ContentBrowserClient, bool is_main_frame, ui::PageTransition page_transition, bool has_user_gesture, - const std::string& method, - const net::HttpRequestHeaders& headers, network::mojom::URLLoaderFactoryRequest* factory_request, // clang-format off network::mojom::URLLoaderFactory*& out_factory) // NOLINT diff --git a/atom/browser/native_window_mac.mm b/atom/browser/native_window_mac.mm index 90e84ffa7709..38a475e260ec 100644 --- a/atom/browser/native_window_mac.mm +++ b/atom/browser/native_window_mac.mm @@ -24,6 +24,7 @@ #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/strings/sys_string_conversions.h" +#include "components/remote_cocoa/app_shim/bridged_native_widget_impl.h" #include "content/public/browser/browser_accessibility_state.h" #include "native_mate/dictionary.h" #include "skia/ext/skia_utils_mac.h" @@ -31,7 +32,6 @@ #include "ui/gl/gpu_switching_manager.h" #include "ui/views/background.h" #include "ui/views/widget/widget.h" -#include "ui/views_bridge_mac/bridged_native_widget_impl.h" // This view always takes the size of its superview. It is intended to be used // as a NSWindow's contentView. It is needed because NSWindow's implementation diff --git a/atom/browser/net/system_network_context_manager.cc b/atom/browser/net/system_network_context_manager.cc index db0818c92936..c303005ed6cb 100644 --- a/atom/browser/net/system_network_context_manager.cc +++ b/atom/browser/net/system_network_context_manager.cc @@ -167,8 +167,7 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() { network::mojom::NetworkContextParamsPtr network_context_params = network::mojom::NetworkContextParams::New(); - network_context_params->enable_brotli = - base::FeatureList::IsEnabled(features::kBrotliEncoding); + network_context_params->enable_brotli = true; network_context_params->enable_referrers = true; diff --git a/atom/browser/ui/cocoa/atom_ns_window.h b/atom/browser/ui/cocoa/atom_ns_window.h index d5bf6e69f3f9..55daccb0770f 100644 --- a/atom/browser/ui/cocoa/atom_ns_window.h +++ b/atom/browser/ui/cocoa/atom_ns_window.h @@ -6,8 +6,8 @@ #define ATOM_BROWSER_UI_COCOA_ATOM_NS_WINDOW_H_ #include "atom/browser/ui/cocoa/event_dispatching_window.h" +#include "components/remote_cocoa/app_shim/native_widget_mac_nswindow.h" #include "ui/views/widget/native_widget_mac.h" -#include "ui/views_bridge_mac/native_widget_mac_nswindow.h" namespace atom { diff --git a/atom/browser/ui/cocoa/atom_ns_window_delegate.h b/atom/browser/ui/cocoa/atom_ns_window_delegate.h index c38affd20bc1..471a23d95b07 100644 --- a/atom/browser/ui/cocoa/atom_ns_window_delegate.h +++ b/atom/browser/ui/cocoa/atom_ns_window_delegate.h @@ -7,7 +7,7 @@ #include -#include "ui/views_bridge_mac/views_nswindow_delegate.h" // nogncheck +#include "components/remote_cocoa/app_shim/views_nswindow_delegate.h" namespace atom { class NativeWindowMac; diff --git a/atom/browser/ui/cocoa/atom_ns_window_delegate.mm b/atom/browser/ui/cocoa/atom_ns_window_delegate.mm index 6e182cfb311d..934c82960880 100644 --- a/atom/browser/ui/cocoa/atom_ns_window_delegate.mm +++ b/atom/browser/ui/cocoa/atom_ns_window_delegate.mm @@ -11,9 +11,9 @@ #include "atom/browser/ui/cocoa/atom_preview_item.h" #include "atom/browser/ui/cocoa/atom_touch_bar.h" #include "base/mac/mac_util.h" +#include "components/remote_cocoa/app_shim/bridged_native_widget_impl.h" #include "ui/views/cocoa/bridged_native_widget_host_impl.h" #include "ui/views/widget/native_widget_mac.h" -#include "ui/views_bridge_mac/bridged_native_widget_impl.h" using TitleBarStyle = atom::NativeWindowMac::TitleBarStyle;