chore: bump chromium to 108.0.5329.0 (main) (#35628)
Co-authored-by: Samuel Attard <sattard@salesforce.com> Co-authored-by: VerteDinde <vertedinde@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: Jeremy Rose <jeremya@chromium.org>
This commit is contained in:
parent
94955a7999
commit
16f459228b
178 changed files with 1000 additions and 936 deletions
|
@ -18,7 +18,7 @@ This patch adds a few changes to the Chromium code:
|
|||
admin permissions.
|
||||
|
||||
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
|
||||
index 7cd82d27a741f194da5d0b3fcfd9c15c8ea1fa5c..9de82e5422428d6419a24401e0479fbd19a15147 100644
|
||||
index 2db06b7dc4cb729ebfb5ae48ab676a7bc0697a99..19350d58e817ea8ac7868dd90a08cc25836c9921 100644
|
||||
--- a/chrome/browser/process_singleton.h
|
||||
+++ b/chrome/browser/process_singleton.h
|
||||
@@ -102,12 +102,19 @@ class ProcessSingleton {
|
||||
|
@ -51,7 +51,7 @@ index 7cd82d27a741f194da5d0b3fcfd9c15c8ea1fa5c..9de82e5422428d6419a24401e0479fbd
|
|||
base::win::MessageWindow window_; // The message-only window.
|
||||
bool is_virtualized_; // Stuck inside Microsoft Softricity VM environment.
|
||||
diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc
|
||||
index a7647b1f3a9d8421dae277ad1d5c35e3c8147942..99b42b0e8f81c6a5696d56fede3e168cfc282cc3 100644
|
||||
index afe39196a3882326c27527623ffeeb5019f685b0..455585a9f6d59d65bcfd322f4f925641148cbf55 100644
|
||||
--- a/chrome/browser/process_singleton_posix.cc
|
||||
+++ b/chrome/browser/process_singleton_posix.cc
|
||||
@@ -54,6 +54,7 @@
|
||||
|
@ -164,7 +164,7 @@ index a7647b1f3a9d8421dae277ad1d5c35e3c8147942..99b42b0e8f81c6a5696d56fede3e168c
|
|||
int dir_mode = 0;
|
||||
CHECK(base::GetPosixFilePermissions(socket_dir_.GetPath(), &dir_mode) &&
|
||||
diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
|
||||
index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c9611e8287c 100644
|
||||
index f89f9265ba8de66a2f661a77611334dc91c08c0f..009b522049adc32144c51842369dc1156bd959fa 100644
|
||||
--- a/chrome/browser/process_singleton_win.cc
|
||||
+++ b/chrome/browser/process_singleton_win.cc
|
||||
@@ -29,7 +29,9 @@
|
||||
|
@ -177,13 +177,15 @@ index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c96
|
|||
#include "chrome/browser/win/chrome_process_finder.h"
|
||||
#include "chrome/common/chrome_constants.h"
|
||||
#include "chrome/common/chrome_paths.h"
|
||||
@@ -163,11 +165,16 @@ bool ProcessLaunchNotification(
|
||||
@@ -164,6 +166,7 @@ bool ProcessLaunchNotification(
|
||||
}
|
||||
|
||||
bool DisplayShouldKillMessageBox() {
|
||||
+#if 0
|
||||
TRACE_EVENT0("startup", "ProcessSingleton:DisplayShouldKillMessageBox");
|
||||
return chrome::ShowQuestionMessageBoxSync(
|
||||
|
||||
// Ensure there is an instance of ResourceBundle that is initialized for
|
||||
@@ -174,6 +177,10 @@ bool DisplayShouldKillMessageBox() {
|
||||
NULL, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
|
||||
l10n_util::GetStringUTF16(IDS_BROWSER_HUNGBROWSER_MESSAGE)) !=
|
||||
chrome::MESSAGE_BOX_RESULT_NO;
|
||||
|
@ -194,7 +196,7 @@ index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c96
|
|||
}
|
||||
|
||||
// Function was copied from Process::Terminate.
|
||||
@@ -252,9 +259,13 @@ bool ProcessSingleton::EscapeVirtualization(
|
||||
@@ -258,9 +265,13 @@ bool ProcessSingleton::EscapeVirtualization(
|
||||
}
|
||||
|
||||
ProcessSingleton::ProcessSingleton(
|
||||
|
@ -208,7 +210,7 @@ index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c96
|
|||
is_virtualized_(false),
|
||||
lock_file_(INVALID_HANDLE_VALUE),
|
||||
user_data_dir_(user_data_dir),
|
||||
@@ -374,7 +385,7 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
|
||||
@@ -380,7 +391,7 @@ ProcessSingleton::NotifyOtherProcessOrCreate() {
|
||||
bool ProcessSingleton::Create() {
|
||||
TRACE_EVENT0("startup", "ProcessSingleton::Create");
|
||||
|
||||
|
@ -217,7 +219,7 @@ index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c96
|
|||
|
||||
remote_window_ = chrome::FindRunningChromeWindow(user_data_dir_);
|
||||
if (!remote_window_ && !EscapeVirtualization(user_data_dir_)) {
|
||||
@@ -383,7 +394,7 @@ bool ProcessSingleton::Create() {
|
||||
@@ -389,7 +400,7 @@ bool ProcessSingleton::Create() {
|
||||
// access. As documented, it's clearer to NOT request ownership on creation
|
||||
// since it isn't guaranteed we will get it. It is better to create it
|
||||
// without ownership and explicitly get the ownership afterward.
|
||||
|
@ -226,7 +228,7 @@ index 41bc176510f93ef667e4f1373eab61142f3e264f..c375a587abd3d575b5c75a0863b01c96
|
|||
if (!only_me.IsValid()) {
|
||||
DPLOG(FATAL) << "CreateMutex failed";
|
||||
return false;
|
||||
@@ -422,6 +433,17 @@ bool ProcessSingleton::Create() {
|
||||
@@ -428,6 +439,17 @@ bool ProcessSingleton::Create() {
|
||||
window_.CreateNamed(base::BindRepeating(&ProcessLaunchNotification,
|
||||
notification_callback_),
|
||||
user_data_dir_.value());
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue