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

chore: bump chromium to 100.0.4894.0 (main) (#32852)

Browse source 
* chore: bump chromium in DEPS to 100.0.4880.0

* resolve conflicts

* chore: update patches

* fix patch

* PIP20: add a new DocumentOverlayWindowViews subtype

3252789

* Clean up PictureInPictureWindowManager::EnterPictureInPicture()

3424145

* Remove StoragePartitionId.

2811120

* Remove FLoC code

3424359

* media: Make AddSupportedKeySystems() Async

3430502

* [Extensions] Move some l10n file util methods to //extensions/browser

3408192

* chore: IWYU

* Reland "webhid: Grant permissions for policy-allowed devices"

3444147

* Migrate base::Value::GetList() to base::Value::GetListDeprecated(): 2/N.

3435727
3440910
3440088

* [text blink period] Cache blink period instead of fetching from defaults

3419059

* chore: update picture-in-picture.patch

3252789

* ci: update to Xcode 13.2.1

3437552

* chore: bump chromium in DEPS to 100.0.4882.1

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4884.0

* chore: update patches

* chore: bump chromium in DEPS to 100.0.4886.0

* chore: update patches

* Refactor DownloadManager to use StoragePartitionConfig

3222011

* Remove ToWebInputElement() in favor of new WebNode::DynamicTo<> helpers.

3433852

* refactor: autofill to use the color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558
https://bugs.chromium.org/p/chromium/issues/detail?id=1003612

* [ProcessSingleton] Add many more trace events to cover all scenarios

3429325

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* chore: bump chromium in DEPS to 100.0.4888.0

* chore: update patches

* chore: update picture-in-picture.patch

* fixup! refactor: autofill to use the color pipeline

* ci: fixup fix sync

(cherry picked from commit c1e3e395465739bce5ca8e1c5ec1f5bd72b99ebd)

* chore: bump chromium in DEPS to 100.0.4889.0

* chore: update patches

* chore: fix feat_add_data_transfer_to_requestsingleinstancelock.patch

* fixup! PIP20: add a new DocumentOverlayWindowViews subtype

* Remove remaining NativeTheme::GetSystemColor() machinery.

3421719

* ci: fetch proper esbuild for macos

* ci: fixup fetch proper esbuild for macos

* fix: failing Node.js test on outdated CurrentValueSerializerFormatVersion

* chore: bump chromium in DEPS to 100.0.4892.0

* 3460365: Set V8 fatal error callbacks during Isolate initialization

3460365

* 3454343: PIP20: use permanent top controls

3454343

* 3465574: Move most of GTK color mixers to ui/color/.

3465574

* chore: fixup patch indices

* 3445327: [locales] Remove locales reference

3445327

* 3456548: [DBB][#7] Blue border falls back to all tab if cropped-to zero pixels

3456548

* 3441196: Convert GuestView's remaining legacy IPC messages to Mojo

3441196

* 3455491: Don't include run_loop.h in thread_task_runner_handle.h

3455491

* fixup! 3454343: PIP20: use permanent top controls

* 3442501: Add missing includes of //base/observer_list.h

3442501

* 3437552: mac: Deploy a new hermetic build of Xcode 13.2.1 13C100

3437552

* chore: bump chromium in DEPS to 100.0.4894.0

* fixup! 3460365: Set V8 fatal error callbacks during Isolate initialization

* chore: update patches

* 3425231: Use DnsOverHttpsConfig where appropriate

3425231

* test: disable test-heapsnapshot-near-heap-limit-worker.js

As a result of CLs linked in https://bugs.chromium.org/p/v8/issues/detail?id=12503,
heap snapshotting near the heap limit DCHECKS in Node.js specs. This will
likely require a larger refactor in Node.js so i've disabled the test for
now and opened an upstream issue on node-v8 issue
at https://github.com/nodejs/node-v8/issues/218.

* Port all usage of NativeTheme color IDs to color pipeline

https://bugs.chromium.org/p/chromium/issues/detail?id=1249558

* chore: update patches after rebase

* ci: use gen2 machine for more disk space

* ci: don't try to make root volume writeable

* ci: use older xcode/macos for tests

* fix: html fullscreen transitions stacking

(cherry picked from commit 5e10965cdd7b2a024def5fc568912cefd0f05b44)

* ci: speed up woa testing

(cherry picked from commit 75c33c48b032137794f5734348a9ee3daa60d9de)
(cherry picked from commit e81996234029669663bf0daaababd34684dcbb17)

* ci: disable flaky tests on WOA

* ci: run remote tests separately to isolate issue there

* tests: disable node test parallel/test-worker-debug for now

* revert: fix: html fullscreen transitions stacking

* tests: disable flaky test on macOS arm64

* fixup circleci config so build tools can find xcode version

* make sure the workspace is clean before job runs

(cherry picked from commit 75f713c9748ac1a356846c39f268886130554fd6)

* tests: disable flaky test on Linux

* ci: debug why windows i32 is crashing

* Revert "ci: debug why windows i32 is crashing"

This reverts commit 4c4bba87ea76f16ef3b304dadff59ad4d366f60f.

Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Rose <nornagon@nornagon.net>
Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Co-authored-by: deepak1556 <hop2deep@gmail.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
electron-roller[bot] 2022-02-25 13:17:35 -05:00 • committed by GitHub
parent c1a667c931
commit 3da598015b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
135 changed files with 1038 additions and 852 deletions
Download patch file Download diff file Expand all files Collapse all files

35
shell/browser/api/electron_api_app.cc
View file

@ -34,7 +34,7 @@
#include "content/public/common/content_switches.h"
#include "crypto/crypto_buildflags.h"
#include "media/audio/audio_manager.h"
#include "net/dns/public/dns_over_https_server_config.h"
#include "net/dns/public/dns_over_https_config.h"
#include "net/dns/public/util.h"
#include "net/ssl/client_cert_identity.h"
#include "net/ssl/ssl_cert_request_info.h"
@ -1640,18 +1640,14 @@ void ConfigureHostResolver(v8::Isolate* isolate,
}
default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
}
std::string server_method;
std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
net::DnsOverHttpsConfig doh_config;
if (!default_doh_templates.empty() &&
secure_dns_mode != net::SecureDnsMode::kOff) {
for (base::StringPiece server_template :
SplitStringPiece(default_doh_templates, " ", base::TRIM_WHITESPACE,
base::SPLIT_WANT_NONEMPTY)) {
if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
std::string(server_template))) {
dns_over_https_servers.push_back(server_config.value());
}
}
auto maybe_doh_config =
net::DnsOverHttpsConfig::FromString(default_doh_templates);
if (maybe_doh_config.has_value())
doh_config = maybe_doh_config.value();
}
bool enable_built_in_resolver =
@ -1677,17 +1673,20 @@ void ConfigureHostResolver(v8::Isolate* isolate,
thrower.ThrowTypeError("secureDnsServers must be an array of strings");
return;
}
dns_over_https_servers.clear();
// Validate individual server templates prior to batch-assigning to
// doh_config.
for (const std::string& server_template : secure_dns_server_strings) {
if (auto server_config =
net::DnsOverHttpsServerConfig::FromString(server_template)) {
dns_over_https_servers.push_back(server_config.value());
} else {
absl::optional<net::DnsOverHttpsConfig> server_config =
net::DnsOverHttpsConfig::FromString(server_template);
if (!server_config.has_value()) {
thrower.ThrowTypeError(std::string("not a valid DoH template: ") +
server_template);
return;
}
}
doh_config = *net::DnsOverHttpsConfig::FromStrings(
std::move(secure_dns_server_strings));
}
if (opts.Has("enableAdditionalDnsQueryTypes") &&
@ -1700,8 +1699,8 @@ void ConfigureHostResolver(v8::Isolate* isolate,
// Configure the stub resolver. This must be done after the system
// NetworkContext is created, but before anything has the chance to use it.
content::GetNetworkService()->ConfigureStubHostResolver(
enable_built_in_resolver, secure_dns_mode,
std::move(dns_over_https_servers), additional_dns_query_types_enabled);
enable_built_in_resolver, secure_dns_mode, doh_config,
additional_dns_query_types_enabled);
}
// static

1
shell/browser/api/electron_api_net.cc
View file

@ -6,6 +6,7 @@
#include "gin/handle.h"
#include "net/base/network_change_notifier.h"
#include "net/http/http_util.h"
#include "services/network/public/cpp/features.h"
#include "shell/browser/api/electron_api_url_loader.h"
#include "shell/common/gin_helper/dictionary.h"

8
shell/browser/api/electron_api_session.cc
View file

@ -261,9 +261,11 @@ void DownloadIdCallback(content::DownloadManager* download_manager,
const base::Time& start_time,
uint32_t id) {
download_manager->CreateDownloadItem(
base::GenerateGUID(), id, path, path, url_chain, GURL(), GURL(), GURL(),
GURL(), absl::nullopt, mime_type, mime_type, start_time, base::Time(),
etag, last_modified, offset, length, std::string(),
base::GenerateGUID(), id, path, path, url_chain, GURL(),
content::StoragePartitionConfig::CreateDefault(
download_manager->GetBrowserContext()),
GURL(), GURL(), absl::nullopt, mime_type, mime_type, start_time,
base::Time(), etag, last_modified, offset, length, std::string(),
download::DownloadItem::INTERRUPTED,
download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
download::DOWNLOAD_INTERRUPT_REASON_NETWORK_TIMEOUT, false, base::Time(),

1
shell/browser/api/electron_api_url_loader.cc
View file

@ -17,6 +17,7 @@
#include "mojo/public/cpp/bindings/remote.h"
#include "mojo/public/cpp/system/data_pipe_producer.h"
#include "net/base/load_flags.h"
#include "net/http/http_util.h"
#include "services/network/public/cpp/resource_request.h"
#include "services/network/public/cpp/simple_url_loader.h"
#include "services/network/public/mojom/chunked_data_pipe_getter.mojom.h"

22
shell/browser/api/electron_api_web_contents.cc
View file

@ -390,9 +390,10 @@ void OnCapturePageDone(gin_helper::Promise<gfx::Image> promise,
absl::optional<base::TimeDelta> GetCursorBlinkInterval() {
#if BUILDFLAG(IS_MAC)
base::TimeDelta interval;
if (ui::TextInsertionCaretBlinkPeriod(&interval))
return interval;
absl::optional<base::TimeDelta> system_value(
ui::TextInsertionCaretBlinkPeriodFromDefaults());
if (system_value)
return *system_value;
#elif BUILDFLAG(IS_LINUX)
if (auto* linux_ui = views::LinuxUI::instance())
return linux_ui->GetCursorBlinkInterval();
@ -1086,7 +1087,7 @@ content::WebContents* WebContents::CreateCustomWebContents(
const GURL& opener_url,
const std::string& frame_name,
const GURL& target_url,
const content::StoragePartitionId& partition_id,
const content::StoragePartitionConfig& partition_config,
content::SessionStorageNamespace* session_storage_namespace) {
return nullptr;
}
@ -2773,7 +2774,7 @@ void WebContents::Print(gin::Arguments* args) {
continue;
}
}
if (!page_range_list.GetList().empty())
if (!page_range_list.GetListDeprecated().empty())
settings.SetPath(printing::kSettingPageRange, std::move(page_range_list));
}
@ -3530,12 +3531,10 @@ bool WebContents::TakeFocus(content::WebContents* source, bool reverse) {
}
content::PictureInPictureResult WebContents::EnterPictureInPicture(
content::WebContents* web_contents,
const viz::SurfaceId& surface_id,
const gfx::Size& natural_size) {
content::WebContents* web_contents) {
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture(
web_contents, surface_id, natural_size);
return PictureInPictureWindowManager::GetInstance()
->EnterVideoPictureInPicture(web_contents);
#else
return content::PictureInPictureResult::kNotSupported;
#endif
@ -3687,7 +3686,8 @@ void WebContents::DevToolsIndexPath(
std::unique_ptr<base::Value> parsed_excluded_folders =
base::JSONReader::ReadDeprecated(excluded_folders_message);
if (parsed_excluded_folders && parsed_excluded_folders->is_list()) {
for (const base::Value& folder_path : parsed_excluded_folders->GetList()) {
for (const base::Value& folder_path :
parsed_excluded_folders->GetListDeprecated()) {
if (folder_path.is_string())
excluded_folders.push_back(folder_path.GetString());
}

6
shell/browser/api/electron_api_web_contents.h
View file

@ -500,7 +500,7 @@ class WebContents : public ExclusiveAccessContext,
const GURL& opener_url,
const std::string& frame_name,
const GURL& target_url,
const content::StoragePartitionId& partition_id,
const content::StoragePartitionConfig& partition_config,
content::SessionStorageNamespace* session_storage_namespace) override;
void WebContentsCreatedWithFullParams(
content::WebContents* source_contents,
@ -689,9 +689,7 @@ class WebContents : public ExclusiveAccessContext,
bool IsFullscreenForTabOrPending(const content::WebContents* source) override;
bool TakeFocus(content::WebContents* source, bool reverse) override;
content::PictureInPictureResult EnterPictureInPicture(
content::WebContents* web_contents,
const viz::SurfaceId&,
const gfx::Size& natural_size) override;
content::WebContents* web_contents) override;
void ExitPictureInPicture() override;
// InspectableWebContentsDelegate:

2
shell/browser/api/frame_subscriber.cc
View file

@ -145,6 +145,8 @@ void FrameSubscriber::OnFrameCaptured(
Done(content_rect, bitmap);
}
void FrameSubscriber::OnFrameWithEmptyRegionCapture() {}
void FrameSubscriber::OnStopped() {}
void FrameSubscriber::OnLog(const std::string& message) {}

1
shell/browser/api/frame_subscriber.h
View file

@ -59,6 +59,7 @@ class FrameSubscriber : public content::WebContentsObserver,
const gfx::Rect& content_rect,
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
callbacks) override;
void OnFrameWithEmptyRegionCapture() override;
void OnStopped() override;
void OnLog(const std::string& message) override;

2
shell/browser/browser_linux.cc
View file

@ -207,7 +207,7 @@ void Browser::ShowAboutPanel() {
if ((val = opts.FindListKey("authors"))) {
std::vector<const char*> cstrs;
for (const auto& authorVal : val->GetList()) {
for (const auto& authorVal : val->GetListDeprecated()) {
if (authorVal.is_string()) {
cstrs.push_back(authorVal.GetString().c_str());
}

9
shell/browser/browser_process_impl.cc
View file

@ -255,11 +255,6 @@ BrowserProcessImpl::subresource_filter_ruleset_service() {
return nullptr;
}
federated_learning::FlocSortingLshClustersService*
BrowserProcessImpl::floc_sorting_lsh_clusters_service() {
return nullptr;
}
component_updater::ComponentUpdateService*
BrowserProcessImpl::component_updater() {
return nullptr;
@ -294,6 +289,10 @@ SerialPolicyAllowedPorts* BrowserProcessImpl::serial_policy_allowed_ports() {
return nullptr;
}
HidPolicyAllowedDevices* BrowserProcessImpl::hid_policy_allowed_devices() {
return nullptr;
}
void BrowserProcessImpl::SetApplicationLocale(const std::string& locale) {
locale_ = locale;
}

3
shell/browser/browser_process_impl.h
View file

@ -82,8 +82,6 @@ class BrowserProcessImpl : public BrowserProcess {
safe_browsing::SafeBrowsingService* safe_browsing_service() override;
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
federated_learning::FlocSortingLshClustersService*
floc_sorting_lsh_clusters_service() override;
component_updater::ComponentUpdateService* component_updater() override;
MediaFileSystemRegistry* media_file_system_registry() override;
WebRtcLogUploader* webrtc_log_uploader() override;
@ -93,6 +91,7 @@ class BrowserProcessImpl : public BrowserProcess {
override;
resource_coordinator::TabManager* GetTabManager() override;
SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
HidPolicyAllowedDevices* hid_policy_allowed_devices() override;
void CreateDevToolsProtocolHandler() override {}
void CreateDevToolsAutoOpener() override {}
void set_background_mode_manager_for_test(

38
shell/browser/electron_browser_client.cc
View file

@ -154,7 +154,7 @@
#include "extensions/browser/extension_protocols.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extensions_browser_client.h"
#include "extensions/browser/guest_view/extensions_guest_view_message_filter.h"
#include "extensions/browser/guest_view/extensions_guest_view.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/browser/info_map.h"
#include "extensions/browser/process_manager.h"
@ -189,7 +189,8 @@
#endif
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE) && BUILDFLAG(IS_WIN)
#include "chrome/browser/ui/views/overlay/overlay_window_views.h"
#include "chrome/browser/ui/views/overlay/document_overlay_window_views.h"
#include "chrome/browser/ui/views/overlay/video_overlay_window_views.h"
#include "shell/browser/browser.h"
#include "ui/aura/window.h"
#include "ui/aura/window_tree_host.h"
@ -422,8 +423,6 @@ void ElectronBrowserClient::RenderProcessWillLaunch(
host->AddFilter(
new extensions::ExtensionMessageFilter(process_id, browser_context));
host->AddFilter(new extensions::ExtensionsGuestViewMessageFilter(
process_id, browser_context));
host->AddFilter(
new ElectronExtensionMessageFilter(process_id, browser_context));
host->AddFilter(
@ -746,15 +745,33 @@ bool ElectronBrowserClient::CanCreateWindow(
}
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
std::unique_ptr<content::OverlayWindow>
ElectronBrowserClient::CreateWindowForPictureInPicture(
content::PictureInPictureWindowController* controller) {
auto overlay_window = content::OverlayWindow::Create(controller);
std::unique_ptr<content::VideoOverlayWindow>
ElectronBrowserClient::CreateWindowForVideoPictureInPicture(
content::VideoPictureInPictureWindowController* controller) {
auto overlay_window = content::VideoOverlayWindow::Create(controller);
#if BUILDFLAG(IS_WIN)
std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
if (!app_user_model_id.empty()) {
auto* overlay_window_view =
static_cast<OverlayWindowViews*>(overlay_window.get());
static_cast<VideoOverlayWindowViews*>(overlay_window.get());
ui::win::SetAppIdForWindow(app_user_model_id,
overlay_window_view->GetNativeWindow()
->GetHost()
->GetAcceleratedWidget());
}
#endif
return overlay_window;
}
std::unique_ptr<content::DocumentOverlayWindow>
ElectronBrowserClient::CreateWindowForDocumentPictureInPicture(
content::DocumentPictureInPictureWindowController* controller) {
auto overlay_window = content::DocumentOverlayWindow::Create(controller);
#if BUILDFLAG(IS_WIN)
std::wstring app_user_model_id = Browser::Get()->GetAppUserModelID();
if (!app_user_model_id.empty()) {
auto* overlay_window_view =
static_cast<DocumentOverlayWindowViews*>(overlay_window.get());
ui::win::SetAppIdForWindow(app_user_model_id,
overlay_window_view->GetNativeWindow()
->GetHost()
@ -1591,6 +1608,9 @@ void ElectronBrowserClient::ExposeInterfacesToRenderer(
#if BUILDFLAG(ENABLE_ELECTRON_EXTENSIONS)
associated_registry->AddInterface(base::BindRepeating(
&extensions::EventRouter::BindForRenderer, render_process_host->GetID()));
associated_registry->AddInterface(
base::BindRepeating(&extensions::ExtensionsGuestView::CreateForExtensions,
render_process_host->GetID()));
#endif
}

8
shell/browser/electron_browser_client.h
View file

@ -153,8 +153,12 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
bool opener_suppressed,
bool* no_javascript_access) override;
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
std::unique_ptr<content::OverlayWindow> CreateWindowForPictureInPicture(
content::PictureInPictureWindowController* controller) override;
std::unique_ptr<content::VideoOverlayWindow>
CreateWindowForVideoPictureInPicture(
content::VideoPictureInPictureWindowController* controller) override;
std::unique_ptr<content::DocumentOverlayWindow>
CreateWindowForDocumentPictureInPicture(
content::DocumentPictureInPictureWindowController* controller) override;
#endif
void GetAdditionalAllowedSchemesForFileSystem(
std::vector<std::string>* additional_schemes) override;

2
shell/browser/electron_browser_context.cc
View file

@ -220,7 +220,7 @@ void ElectronBrowserContext::InitPrefs() {
auto* current_dictionaries =
prefs()->Get(spellcheck::prefs::kSpellCheckDictionaries);
// No configured dictionaries, the default will be en-US
if (current_dictionaries->GetList().empty()) {
if (current_dictionaries->GetListDeprecated().empty()) {
std::string default_code = spellcheck::GetCorrespondingSpellCheckLanguage(
base::i18n::GetConfiguredLocale());
if (!default_code.empty()) {

2
shell/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc
View file

@ -58,7 +58,7 @@ bool ContainsAppIdByHash(const base::ListValue& list,
return false;
}
for (const auto& i : list.GetList()) {
for (const auto& i : list.GetListDeprecated()) {
const std::string& s = i.GetString();
if (s.find('/') == std::string::npos) {
// No slashes mean that this is a webauthn RP ID, not a U2F AppID.

4
shell/browser/extensions/electron_extension_host_delegate.cc
View file

@ -71,9 +71,7 @@ bool ElectronExtensionHostDelegate::CheckMediaAccessPermission(
content::PictureInPictureResult
ElectronExtensionHostDelegate::EnterPictureInPicture(
content::WebContents* web_contents,
const viz::SurfaceId& surface_id,
const gfx::Size& natural_size) {
content::WebContents* web_contents) {
NOTREACHED();
return content::PictureInPictureResult();
}

4
shell/browser/extensions/electron_extension_host_delegate.h
View file

@ -41,9 +41,7 @@ class ElectronExtensionHostDelegate : public ExtensionHostDelegate {
blink::mojom::MediaStreamType type,
const Extension* extension) override;
content::PictureInPictureResult EnterPictureInPicture(
content::WebContents* web_contents,
const viz::SurfaceId& surface_id,
const gfx::Size& natural_size) override;
content::WebContents* web_contents) override;
void ExitPictureInPicture() override;
};

8
shell/browser/extensions/electron_extension_message_filter.cc
View file

@ -21,9 +21,9 @@
#include "content/public/browser/render_process_host.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/l10n_file_util.h"
#include "extensions/common/extension_messages.h"
#include "extensions/common/extension_set.h"
#include "extensions/common/file_util.h"
#include "extensions/common/manifest_handlers/default_locale_handler.h"
#include "extensions/common/manifest_handlers/shared_module_info.h"
#include "extensions/common/message_bundle.h"
@ -104,8 +104,8 @@ void ElectronExtensionMessageFilter::OnGetExtMessageBundle(
if (default_locale.empty()) {
// A little optimization: send the answer here to avoid an extra thread hop.
std::unique_ptr<extensions::MessageBundle::SubstitutionMap> dictionary_map(
extensions::file_util::LoadNonLocalizedMessageBundleSubstitutionMap(
extension_id));
extensions::l10n_file_util::
LoadNonLocalizedMessageBundleSubstitutionMap(extension_id));
ExtensionHostMsg_GetMessageBundle::WriteReplyParams(reply_msg,
*dictionary_map);
Send(reply_msg);
@ -147,7 +147,7 @@ void ElectronExtensionMessageFilter::OnGetExtMessageBundleAsync(
extension_l10n_util::GzippedMessagesPermission gzip_permission,
IPC::Message* reply_msg) {
std::unique_ptr<extensions::MessageBundle::SubstitutionMap> dictionary_map(
extensions::file_util::LoadMessageBundleSubstitutionMapFromPaths(
extensions::l10n_file_util::LoadMessageBundleSubstitutionMapFromPaths(
extension_paths, main_extension_id, default_locale, gzip_permission));
ExtensionHostMsg_GetMessageBundle::WriteReplyParams(reply_msg,

4
shell/browser/extensions/electron_extensions_browser_client.cc
View file

@ -310,8 +310,8 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
return;
}
auto event = std::make_unique<extensions::Event>(histogram_value, event_name,
std::move(*args).TakeList());
auto event = std::make_unique<extensions::Event>(
histogram_value, event_name, std::move(*args).TakeListDeprecated());
auto& context_map = ElectronBrowserContext::browser_context_map();
for (auto const& entry : context_map) {
if (entry.second) {

6
shell/browser/file_select_helper.cc
View file

@ -21,7 +21,6 @@
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/platform_util.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#include "content/public/browser/browser_task_traits.h"
@ -165,10 +164,7 @@ void FileSelectHelper::OnListFile(
void FileSelectHelper::LaunchConfirmationDialog(
const base::FilePath& path,
std::vector<ui::SelectedFileInfo> selected_files) {
ShowFolderUploadConfirmationDialog(
path,
base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
std::move(selected_files), web_contents_);
ConvertToFileChooserFileInfoList(std::move(selected_files));
}
void FileSelectHelper::OnListDone(int error) {

2
shell/browser/javascript_environment.cc
View file

@ -156,6 +156,8 @@ JavascriptEnvironment::JavascriptEnvironment(uv_loop_t* event_loop)
gin::IsolateHolder::IsolateCreationMode::kNormal,
nullptr,
nullptr,
nullptr,
nullptr,
isolate_),
locker_(isolate_) {
isolate_->Enter();

2
shell/browser/net/electron_url_loader_factory.cc
View file

@ -122,7 +122,7 @@ network::mojom::URLResponseHeadPtr ToResponseHead(
head->headers->AddHeader(iter.first, iter.second.GetString());
} else if (iter.second.is_list()) {
// key: [values...]
for (const auto& item : iter.second.GetList()) {
for (const auto& item : iter.second.GetListDeprecated()) {
if (item.is_string())
head->headers->AddHeader(iter.first, item.GetString());
}

1
shell/browser/net/network_context_service.cc
View file

@ -11,6 +11,7 @@
#include "content/public/browser/network_service_instance.h"
#include "content/public/browser/shared_cors_origin_access_list.h"
#include "electron/fuses.h"
#include "net/http/http_util.h"
#include "net/net_buildflags.h"
#include "services/network/network_service.h"
#include "services/network/public/cpp/cors/origin_access_list.h"

18
shell/browser/net/system_network_context_manager.cc
View file

@ -25,7 +25,7 @@
#include "content/public/common/network_service_util.h"
#include "electron/fuses.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
#include "net/dns/public/dns_over_https_server_config.h"
#include "net/dns/public/dns_over_https_config.h"
#include "net/dns/public/util.h"
#include "net/net_buildflags.h"
#include "services/cert_verifier/public/mojom/cert_verifier_service_factory.mojom.h"
@ -273,18 +273,11 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
}
default_doh_templates = features::kDnsOverHttpsTemplatesParam.Get();
}
std::string server_method;
std::vector<net::DnsOverHttpsServerConfig> dns_over_https_servers;
net::DnsOverHttpsConfig doh_config;
if (!default_doh_templates.empty() &&
default_secure_dns_mode != net::SecureDnsMode::kOff) {
for (base::StringPiece server_template :
SplitStringPiece(default_doh_templates, " ", base::TRIM_WHITESPACE,
base::SPLIT_WANT_NONEMPTY)) {
if (auto server_config = net::DnsOverHttpsServerConfig::FromString(
std::string(server_template))) {
dns_over_https_servers.push_back(server_config.value());
}
}
doh_config = *net::DnsOverHttpsConfig::FromString(default_doh_templates);
}
bool additional_dns_query_types_enabled = true;
@ -293,8 +286,7 @@ void SystemNetworkContextManager::OnNetworkServiceCreated(
// NetworkContext is created, but before anything has the chance to use it.
content::GetNetworkService()->ConfigureStubHostResolver(
base::FeatureList::IsEnabled(features::kAsyncDns),
default_secure_dns_mode, std::move(dns_over_https_servers),
additional_dns_query_types_enabled);
default_secure_dns_mode, doh_config, additional_dns_query_types_enabled);
std::string app_name = electron::Browser::Get()->GetName();
#if BUILDFLAG(IS_MAC)

2
shell/browser/osr/osr_video_consumer.cc
View file

@ -121,6 +121,8 @@ void OffScreenVideoConsumer::OnFrameCaptured(
callback_.Run(*update_rect, bitmap);
}
void OffScreenVideoConsumer::OnFrameWithEmptyRegionCapture() {}
void OffScreenVideoConsumer::OnStopped() {}
void OffScreenVideoConsumer::OnLog(const std::string& message) {}

1
shell/browser/osr/osr_video_consumer.h
View file

@ -43,6 +43,7 @@ class OffScreenVideoConsumer : public viz::mojom::FrameSinkVideoConsumer {
const gfx::Rect& content_rect,
mojo::PendingRemote<viz::mojom::FrameSinkVideoConsumerFrameCallbacks>
callbacks) override;
void OnFrameWithEmptyRegionCapture() override;
void OnStopped() override;
void OnLog(const std::string& message) override;

9
shell/browser/ui/autofill_popup.cc
View file

@ -15,6 +15,8 @@
#include "shell/browser/ui/autofill_popup.h"
#include "shell/common/api/api.mojom.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_provider.h"
#include "ui/color/color_id.h"
#include "ui/color/color_provider.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
#include "ui/gfx/geometry/point.h"
@ -310,11 +312,10 @@ const gfx::FontList& AutofillPopup::GetLabelFontListForRow(int index) const {
return smaller_font_list_;
}
ui::NativeTheme::ColorId AutofillPopup::GetBackgroundColorIDForRow(
int index) const {
ui::ColorId AutofillPopup::GetBackgroundColorIDForRow(int index) const {
return (view_ && index == view_->GetSelectedLine())
? ui::NativeTheme::kColorId_ResultsTableHoveredBackground
: ui::NativeTheme::kColorId_ResultsTableNormalBackground;
? ui::kColorResultsTableHoveredBackground
: ui::kColorResultsTableNormalBackground;
}
int AutofillPopup::GetLineCount() {

4
shell/browser/ui/autofill_popup.h
View file

@ -9,8 +9,8 @@
#include "content/public/browser/render_frame_host.h"
#include "shell/browser/ui/views/autofill_popup_view.h"
#include "ui/color/color_id.h"
#include "ui/gfx/font_list.h"
#include "ui/native_theme/native_theme.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
@ -54,7 +54,7 @@ class AutofillPopup : public views::ViewObserver {
gfx::Rect GetRowBounds(int i);
const gfx::FontList& GetValueFontListForRow(int index) const;
const gfx::FontList& GetLabelFontListForRow(int index) const;
ui::NativeTheme::ColorId GetBackgroundColorIDForRow(int index) const;
ui::ColorId GetBackgroundColorIDForRow(int index) const;
int GetLineCount();
std::u16string GetValueAt(int i);

2
shell/browser/ui/inspectable_web_contents.cc
View file

@ -1023,7 +1023,7 @@ void InspectableWebContents::HandleMessageFromDevToolsFrontend(
int id = message.FindIntKey(kFrontendHostId).value_or(0);
std::vector<base::Value> params_list;
if (params)
params_list = std::move(*params).TakeList();
params_list = std::move(*params).TakeListDeprecated();
embedder_message_dispatcher_->Dispatch(
base::BindRepeating(&InspectableWebContents::SendMessageAck,
weak_factory_.GetWeakPtr(), id),

16
shell/browser/ui/views/autofill_popup_view.cc
View file

@ -13,6 +13,7 @@
#include "content/public/browser/render_view_host.h"
#include "ui/accessibility/ax_enums.mojom.h"
#include "ui/base/dragdrop/drag_drop_types.h"
#include "ui/color/color_provider.h"
#include "ui/events/keycodes/keyboard_codes.h"
#include "ui/gfx/canvas.h"
#include "ui/gfx/geometry/point.h"
@ -88,8 +89,7 @@ void AutofillPopupView::Show() {
SetBorder(views::CreateSolidBorder(
kPopupBorderThickness,
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_UnfocusedBorderColor)));
GetColorProvider()->GetColor(ui::kColorUnfocusedBorder)));
DoUpdateBoundsAndRedrawPopup();
GetWidget()->Show();
@ -167,7 +167,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
if (!popup_)
return;
canvas->FillRect(entry_rect, GetNativeTheme()->GetSystemColor(
canvas->FillRect(entry_rect, GetColorProvider()->GetColor(
popup_->GetBackgroundColorIDForRow(index)));
const bool is_rtl = base::i18n::IsRTL();
@ -185,8 +185,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
canvas->DrawStringRectWithFlags(
popup_->GetValueAt(index), popup_->GetValueFontListForRow(index),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_ResultsTableNormalText),
GetColorProvider()->GetColor(ui::kColorResultsTableNormalText),
gfx::Rect(value_x_align_left, value_rect.y(), value_width,
value_rect.height()),
text_align);
@ -201,8 +200,7 @@ void AutofillPopupView::DrawAutofillEntry(gfx::Canvas* canvas,
canvas->DrawStringRectWithFlags(
popup_->GetLabelAt(index), popup_->GetLabelFontListForRow(index),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_ResultsTableDimmedText),
GetColorProvider()->GetColor(ui::kColorResultsTableDimmedText),
gfx::Rect(label_x_align_left, entry_rect.y(), label_width,
entry_rect.height()),
text_align);
@ -252,8 +250,8 @@ void AutofillPopupView::OnPaint(gfx::Canvas* canvas) {
}
#endif
draw_canvas->DrawColor(GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_ResultsTableNormalBackground));
draw_canvas->DrawColor(
GetColorProvider()->GetColor(ui::kColorResultsTableNormalBackground));
OnPaintBorder(draw_canvas);
for (int i = 0; i < popup_->GetLineCount(); ++i) {

19
shell/browser/ui/views/menu_bar.cc
View file

@ -8,6 +8,7 @@
#include "shell/browser/native_window.h"
#include "shell/browser/ui/views/submenu_button.h"
#include "ui/color/color_provider.h"
#include "ui/native_theme/common_theme.h"
#include "ui/views/background.h"
#include "ui/views/layout/box_layout.h"
@ -34,10 +35,13 @@ const char MenuBar::kViewClassName[] = "ElectronMenuBar";
MenuBar::MenuBar(NativeWindow* window, RootView* root_view)
: background_color_(kDefaultColor), window_(window), root_view_(root_view) {
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
RefreshColorCache(theme);
UpdateViewColors();
#if BUILDFLAG(IS_WIN)
SetBackground(
views::CreateThemedSolidBackground(this, ui::kColorMenuBackground));
background_color_ = GetBackground()->get_color();
#endif
SetFocusBehavior(FocusBehavior::ALWAYS);
SetLayoutManager(std::make_unique<views::BoxLayout>(
views::BoxLayout::Orientation::kHorizontal));
@ -156,9 +160,7 @@ bool MenuBar::SetPaneFocusAndFocusDefault() {
void MenuBar::OnThemeChanged() {
views::AccessiblePaneView::OnThemeChanged();
const ui::NativeTheme* theme = root_view_->GetNativeTheme();
if (theme) {
RefreshColorCache(theme);
}
RefreshColorCache(theme);
UpdateViewColors();
}
@ -215,9 +217,6 @@ void MenuBar::RefreshColorCache(const ui::NativeTheme* theme) {
gtk::GetFgColor("GtkMenuBar#menubar GtkMenuItem#menuitem GtkLabel");
disabled_color_ = gtk::GetFgColor(
"GtkMenuBar#menubar GtkMenuItem#menuitem:disabled GtkLabel");
#else
background_color_ =
ui::GetAuraColor(ui::NativeTheme::kColorId_MenuBackgroundColor, theme);
#endif
}
}
@ -235,8 +234,10 @@ void MenuBar::RebuildChildren() {
}
void MenuBar::UpdateViewColors() {
#if BUILDFLAG(IS_LINUX)
// set menubar background color
SetBackground(views::CreateSolidBackground(background_color_));
#endif
// set child colors
if (menu_model_ == nullptr)

1
shell/browser/web_contents_zoom_controller.h
View file

@ -5,6 +5,7 @@
#ifndef ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
#define ELECTRON_SHELL_BROWSER_WEB_CONTENTS_ZOOM_CONTROLLER_H_
#include "base/observer_list.h"
#include "base/observer_list_types.h"
#include "content/public/browser/host_zoom_map.h"
#include "content/public/browser/web_contents_observer.h"