chore: bump chromium to 100.0.4857.0 (main) (#32419)
* chore: bump chromium in DEPS to 99.0.4819.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4824.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4827.0 * chore: update patches * 3352511: PiP: Add inkdrop and pointer cursor to PiP window buttons3352511* 3309164: webhid: Show FIDO devices in the chooser if allowed3309164* 3297868: hid: Add experimental HIDDevice.forget()3297868* 3362491: [Extensions] Move i18n API to //extensions3362491* MCC Refactor step0: Allow embedders to register associated_interface binders with RenderFrameHostImpl::associated_registry_.3281481* 3352616: [Gtk] Remove libgtk from the link-line3352616* 3249211: Clear-Site-Data support for partitioned cookies3249211* [Extensions][COIL] Use [allow|block]list in //extensions/common3372668* Begin ScopedUserPrefUpdate migration to modern base::Value3376154* [Code Health] Refactor PrefService GetDict + GetList to use base::Value3343526* 3354997: [CodeHealth] Remove deprecated SetDictionary method3354997* 3287323: Add LacrosPrefStore for lacros settings3287323* 3365916: [PA] Clean up remaining lazy commit code3365916* [MPArch] Target the external protocol error at the responsible frame.3011560* Pass origin to RegisterNonNetworkSubresourceURLLoaderFactories3350608* Linux: Send OSCrypt raw encryption key to the Network Service3320484* [PlzServiceWorker] Remove remaining references to PlzServiceWorker.3359441* chore: fixup for lint * 3327621: Fix tablet mode detection for Win 11.3327621* 3342428: ax_mac: move AXTextMarker conversion utils under ui umbrella3342428* 3353974: Mac: Use base::Feature for overlay features3353974* chore: bump chromium in DEPS to 99.0.4828.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4837.0 * chore: update patches * chore: update patches * 3379142: Drop FALLTHROUGH macro Ref:3379142* 3381749: C++17: Allow use of std::map::try_emplace and std::map::insert_or_assign Ref:3381749* chore: bump chromium in DEPS to 99.0.4839.0 * chore: update patches * chore: bump chromium in DEPS to 99.0.4840.0 * chore: bump chromium in DEPS to 99.0.4844.0 * 3395881: [api] Deprecate Local<v8::Context> v8::Object::CreationContext() Ref:3395881* chore: update patches * chore: bump chromium in DEPS to 100.0.4845.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4847.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4849.0 * chore: update patches * chore: bump chromium in DEPS to 100.0.4851.0 * chore: bump chromium in DEPS to 100.0.4853.0 * update patches * chore: update patches * update patches * 3383599: Fonts Access: Remove prototype that uses a font picker.3383599* 3404768: Remove ALLOW_UNUSED macros3404768* 3374762: Remove ignore_result.h3374762* 3399305: [unseasoned-pdf] Apply proper frame offsets for touch selections3399305* 3402210: [Extensions] Don't trigger unload event for already unloaded extension3402210* 3410912: Combine URLLoaderClient OnReceiveResponse and OnStartLoadingResponseBody.3410912* 3370428: Make the AuthSchemes policy support dynamic refresh3370428* 3407603: Finish ScopedUserPrefUpdate migration to modern base::Value3407603* 3378352: ozone/x11: move code from //ui/p/x11 to //ui/ozone/p/x113378352* 3370810: Delete chrome/service, AKA the Cloud Print service process.3370810* chore: bump chromium in DEPS to 100.0.4855.0 * chore: update patches * fixup! 3370810: Delete chrome/service, AKA the Cloud Print service process. * revert 3348007 to fix windows build * 3318572: [Code health] Fix gn check errors in //extensions/browser:*3318572* fix printing.patch * fix iwyu issue * 3408515: win: Make ShorcutOperation an enum class and modernize names3408515* 3388333: [UIA] Remove dead code accessibility_misc_utils.h/cc3388333* fix windows build? i hope * patch gn visibility of //ui/ozone/platform/x11 * missing include base/logging.h * use BUILDFLAG for USE_NSS_CERTS3379123* defined(OS_*) ==> BUILDFLAG(IS_*) https://bugs.chromium.org/p/chromium/issues/detail?id=1234043 * fixup! 3404768: Remove ALLOW_UNUSED macros * another attempt to fix windows build * temporarily disable the custom scheme service worker test https://github.com/electron/electron/issues/32664 * fix loading mv3 extensions not sure what cl broke this unfort. * fixup! 3404768: Remove ALLOW_UNUSED macros * patch nan3395880* fix node test * fix nullptr in FindPdfFrame * patch perfetto to fix build issue on win-ia32bc44c3c753* fix build for linux-x64-testing-no-run-as-node * fix patch * skip <webview>.capturePage() test https://github.com/electron/electron/issues/32705 * test: fix failing tests of focus/blur events of WebContents (#32711) * inherit stdio from app module test child processes this prevents them from timing out due to full stdout buffers * test to see if we can get better logs on windows ci * try again for appveyor log things * skip contentTracing tests on ia32 * ci: disable gpu compositing * drop applied patch * fix merge fail * Revert "ci: disable gpu compositing" This reverts commit 0344129fcb19ea3e87e06c1110d751f22eba3fec. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@github.com> Co-authored-by: VerteDinde <khammond@slack-corp.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Jeremy Rose <jeremya@chromium.org> Co-authored-by: Jeremy Rose <nornagon@nornagon.net> Co-authored-by: Cheng Zhao <zcbenz@gmail.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
This commit is contained in:
electron-roller[bot]
GitHub
parent
e9a43be9be
commit
28ada6ea8b
279 changed files with 1681 additions and 2236 deletions
|
|
@ -17,6 +17,9 @@
|
|||
#include "base/strings/string_number_conversions.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "chrome/browser/icon_manager.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
#include "chrome/common/chrome_switches.h"
|
||||
#include "components/os_crypt/key_storage_config_linux.h"
|
||||
#include "components/os_crypt/os_crypt.h"
|
||||
#include "content/browser/browser_main_loop.h" // nogncheck
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
|
|
@ -61,7 +64,7 @@
|
|||
#include "ui/wm/core/wm_state.h"
|
||||
#endif
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
#include "base/environment.h"
|
||||
#include "base/threading/thread_task_runner_handle.h"
|
||||
#include "device/bluetooth/bluetooth_adapter_factory.h"
|
||||
|
|
@ -75,14 +78,14 @@
|
|||
#include "ui/views/linux_ui/linux_ui.h"
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
#include "ui/base/l10n/l10n_util_win.h"
|
||||
#include "ui/display/win/dpi.h"
|
||||
#include "ui/gfx/system_fonts_win.h"
|
||||
#include "ui/strings/grit/app_locale_settings.h"
|
||||
#endif
|
||||
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
#include "services/device/public/cpp/geolocation/geolocation_manager.h"
|
||||
#include "shell/browser/ui/cocoa/views_delegate_mac.h"
|
||||
#else
|
||||
|
|
@ -111,7 +114,7 @@ void Erase(T* container, typename T::iterator iter) {
|
|||
container->erase(iter);
|
||||
}
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
// gfx::Font callbacks
|
||||
void AdjustUIFont(gfx::win::FontAdjustment* font_adjustment) {
|
||||
l10n_util::NeedOverrideDefaultUIFont(&font_adjustment->font_family_override,
|
||||
|
|
@ -131,7 +134,7 @@ std::u16string MediaStringProvider(media::MessageId id) {
|
|||
switch (id) {
|
||||
case media::DEFAULT_AUDIO_DEVICE_NAME:
|
||||
return u"Default";
|
||||
#if defined(OS_WIN)
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
case media::COMMUNICATIONS_AUDIO_DEVICE_NAME:
|
||||
return u"Communications";
|
||||
#endif
|
||||
|
|
@ -140,7 +143,7 @@ std::u16string MediaStringProvider(media::MessageId id) {
|
|||
}
|
||||
}
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
// GTK does not provide a way to check if current theme is dark, so we compare
|
||||
// the text and background luminosity to get a result.
|
||||
// This trick comes from FireFox.
|
||||
|
|
@ -158,7 +161,7 @@ void UpdateDarkThemeSetting() {
|
|||
|
||||
} // namespace
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
class DarkThemeObserver : public ui::NativeThemeObserver {
|
||||
public:
|
||||
DarkThemeObserver() = default;
|
||||
|
|
@ -208,10 +211,10 @@ int ElectronBrowserMainParts::GetExitCode() const {
|
|||
|
||||
int ElectronBrowserMainParts::PreEarlyInitialization() {
|
||||
field_trial_list_ = std::make_unique<base::FieldTrialList>(nullptr);
|
||||
#if defined(OS_POSIX)
|
||||
#if BUILDFLAG(IS_POSIX)
|
||||
HandleSIGCHLD();
|
||||
#endif
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
ui::OzonePlatform::PreEarlyInitialization();
|
||||
#endif
|
||||
|
||||
|
|
@ -272,7 +275,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
|
|||
#if defined(USE_AURA)
|
||||
screen_ = views::CreateDesktopScreen();
|
||||
display::Screen::SetScreenInstance(screen_.get());
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
views::LinuxUI::instance()->UpdateDeviceScaleFactor();
|
||||
#endif
|
||||
#endif
|
||||
|
|
@ -283,13 +286,13 @@ int ElectronBrowserMainParts::PreCreateThreads() {
|
|||
auto* command_line = base::CommandLine::ForCurrentProcess();
|
||||
std::string locale = command_line->GetSwitchValueASCII(::switches::kLang);
|
||||
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
// The browser process only wants to support the language Cocoa will use,
|
||||
// so force the app locale to be overridden with that value. This must
|
||||
// happen before the ResourceBundle is loaded
|
||||
if (locale.empty())
|
||||
l10n_util::OverrideLocaleWithCocoaLocale();
|
||||
#elif defined(OS_LINUX)
|
||||
#elif BUILDFLAG(IS_LINUX)
|
||||
// l10n_util::GetApplicationLocaleInternal uses g_get_language_names(),
|
||||
// which keys off of getenv("LC_ALL").
|
||||
// We must set this env first to make ui::ResourceBundle accept the custom
|
||||
|
|
@ -312,7 +315,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
|
|||
ElectronBrowserClient::SetApplicationLocale(app_locale);
|
||||
fake_browser_process_->SetApplicationLocale(app_locale);
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
// Reset to the original LC_ALL since we should not be changing it.
|
||||
if (!locale.empty()) {
|
||||
if (lc_all)
|
||||
|
|
@ -328,7 +331,7 @@ int ElectronBrowserMainParts::PreCreateThreads() {
|
|||
// Force MediaCaptureDevicesDispatcher to be created on UI thread.
|
||||
MediaCaptureDevicesDispatcher::GetInstance();
|
||||
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
ui::InitIdleMonitor();
|
||||
#endif
|
||||
|
||||
|
|
@ -351,7 +354,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
|
|||
extensions_browser_client_.reset();
|
||||
extensions::ExtensionsBrowserClient::Set(nullptr);
|
||||
#endif
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
device::BluetoothAdapterFactory::Shutdown();
|
||||
bluez::DBusBluezManagerWrapperLinux::Shutdown();
|
||||
#endif
|
||||
|
|
@ -359,7 +362,7 @@ void ElectronBrowserMainParts::PostDestroyThreads() {
|
|||
}
|
||||
|
||||
void ElectronBrowserMainParts::ToolkitInitialized() {
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
auto linux_ui = BuildGtkUi();
|
||||
linux_ui->Initialize();
|
||||
DCHECK(ui::LinuxInputMethodContextFactory::instance());
|
||||
|
|
@ -384,12 +387,12 @@ void ElectronBrowserMainParts::ToolkitInitialized() {
|
|||
wm_state_ = std::make_unique<wm::WMState>();
|
||||
#endif
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
gfx::win::SetAdjustFontCallback(&AdjustUIFont);
|
||||
gfx::win::SetGetMinimumFontSizeCallback(&GetMinimumFontSize);
|
||||
#endif
|
||||
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
views_delegate_ = std::make_unique<ViewsDelegateMac>();
|
||||
#else
|
||||
views_delegate_ = std::make_unique<ViewsDelegate>();
|
||||
|
|
@ -439,7 +442,7 @@ int ElectronBrowserMainParts::PreMainMessageLoopRun() {
|
|||
DevToolsManagerDelegate::StartHttpHandler();
|
||||
}
|
||||
|
||||
#if !defined(OS_MAC)
|
||||
#if !BUILDFLAG(IS_MAC)
|
||||
// The corresponding call in macOS is in ElectronApplicationDelegate.
|
||||
Browser::Get()->WillFinishLaunching();
|
||||
Browser::Get()->DidFinishLaunching(base::DictionaryValue());
|
||||
|
|
@ -459,14 +462,34 @@ void ElectronBrowserMainParts::WillRunMainMessageLoop(
|
|||
}
|
||||
|
||||
void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
auto shutdown_cb =
|
||||
base::BindOnce(base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
|
||||
ui::OzonePlatform::GetInstance()->PostCreateMainMessageLoop(
|
||||
std::move(shutdown_cb));
|
||||
bluez::DBusBluezManagerWrapperLinux::Initialize();
|
||||
|
||||
// Set up crypt config. This needs to be done before anything starts the
|
||||
// network service, as the raw encryption key needs to be shared with the
|
||||
// network service for encrypted cookie storage.
|
||||
std::string app_name = electron::Browser::Get()->GetName();
|
||||
const base::CommandLine& command_line =
|
||||
*base::CommandLine::ForCurrentProcess();
|
||||
std::unique_ptr<os_crypt::Config> config =
|
||||
std::make_unique<os_crypt::Config>();
|
||||
// Forward to os_crypt the flag to use a specific password store.
|
||||
config->store = command_line.GetSwitchValueASCII(::switches::kPasswordStore);
|
||||
config->product_name = app_name;
|
||||
config->application_name = app_name;
|
||||
config->main_thread_runner = base::ThreadTaskRunnerHandle::Get();
|
||||
// c.f.
|
||||
// https://source.chromium.org/chromium/chromium/src/+/master:chrome/common/chrome_switches.cc;l=689;drc=9d82515060b9b75fa941986f5db7390299669ef1
|
||||
config->should_use_preference =
|
||||
command_line.HasSwitch(::switches::kEnableEncryptionSelection);
|
||||
base::PathService::Get(chrome::DIR_USER_DATA, &config->user_data_path);
|
||||
OSCrypt::SetConfig(std::move(config));
|
||||
#endif
|
||||
#if defined(OS_POSIX)
|
||||
#if BUILDFLAG(IS_POSIX)
|
||||
// Exit in response to SIGINT, SIGTERM, etc.
|
||||
InstallShutdownSignalHandlers(
|
||||
base::BindOnce(&Browser::Quit, base::Unretained(Browser::Get())),
|
||||
|
|
@ -475,7 +498,7 @@ void ElectronBrowserMainParts::PostCreateMainMessageLoop() {
|
|||
}
|
||||
|
||||
void ElectronBrowserMainParts::PostMainMessageLoopRun() {
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
FreeAppDelegate();
|
||||
#endif
|
||||
|
||||
|
|
@ -504,25 +527,25 @@ void ElectronBrowserMainParts::PostMainMessageLoopRun() {
|
|||
fake_browser_process_->PostMainMessageLoopRun();
|
||||
content::DevToolsAgentHost::StopRemoteDebuggingPipeHandler();
|
||||
|
||||
#if defined(OS_LINUX)
|
||||
#if BUILDFLAG(IS_LINUX)
|
||||
ui::OzonePlatform::GetInstance()->PostMainMessageLoopRun();
|
||||
#endif
|
||||
}
|
||||
|
||||
#if !defined(OS_MAC)
|
||||
#if !BUILDFLAG(IS_MAC)
|
||||
void ElectronBrowserMainParts::PreCreateMainMessageLoop() {
|
||||
PreCreateMainMessageLoopCommon();
|
||||
}
|
||||
#endif
|
||||
|
||||
void ElectronBrowserMainParts::PreCreateMainMessageLoopCommon() {
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
InitializeMainNib();
|
||||
RegisterURLHandler();
|
||||
#endif
|
||||
media::SetLocalizedStringProvider(MediaStringProvider);
|
||||
|
||||
#if defined(OS_WIN)
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
auto* local_state = g_browser_process->local_state();
|
||||
DCHECK(local_state);
|
||||
|
||||
|
|
@ -540,7 +563,7 @@ ElectronBrowserMainParts::GetGeolocationControl() {
|
|||
return geolocation_control_.get();
|
||||
}
|
||||
|
||||
#if defined(OS_MAC)
|
||||
#if BUILDFLAG(IS_MAC)
|
||||
device::GeolocationManager* ElectronBrowserMainParts::GetGeolocationManager() {
|
||||
return geolocation_manager_.get();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue