mirror of
https://github.com/morgan9e/helium
synced 2026-04-15 00:44:06 +09:00
merge: update to ungoogled-chromium 143.0.7499.109
This commit is contained in:
@@ -1 +1 @@
|
|||||||
143.0.7499.40
|
143.0.7499.109
|
||||||
|
|||||||
@@ -2155,6 +2155,7 @@ chrome/browser/ui/webui/management/management_ui_handler_unittest.cc
|
|||||||
chrome/browser/ui/webui/media_router/cast_feedback_ui.cc
|
chrome/browser/ui/webui/media_router/cast_feedback_ui.cc
|
||||||
chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc
|
chrome/browser/ui/webui/nearby_internals/quick_pair/quick_pair_handler.cc
|
||||||
chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler_browsertest.cc
|
chrome/browser/ui/webui/new_tab_footer/new_tab_footer_handler_browsertest.cc
|
||||||
|
chrome/browser/ui/webui/new_tab_page/action_chips/action_chips_generator_unittest.cc
|
||||||
chrome/browser/ui/webui/new_tab_page/action_chips/action_chips_handler_unittest.cc
|
chrome/browser/ui/webui/new_tab_page/action_chips/action_chips_handler_unittest.cc
|
||||||
chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc
|
chrome/browser/ui/webui/new_tab_page/foo/foo_handler.cc
|
||||||
chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc
|
chrome/browser/ui/webui/new_tab_page/new_tab_page_handler_unittest.cc
|
||||||
@@ -8252,6 +8253,7 @@ third_party/devtools-frontend/src/front_end/panels/timeline/TimelineTreeView.ts
|
|||||||
third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/TimelineUIUtils.test.ts
|
||||||
third_party/devtools-frontend/src/front_end/panels/timeline/TimingsTrackAppender.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/TimingsTrackAppender.ts
|
||||||
third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/components/DetailsView.ts
|
||||||
|
third_party/devtools-frontend/src/front_end/panels/timeline/components/ExportTraceOptions.ts
|
||||||
third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/components/FieldSettingsDialog.ts
|
||||||
third_party/devtools-frontend/src/front_end/panels/timeline/components/LiveMetricsView.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/components/LiveMetricsView.ts
|
||||||
third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarInsightsTab.test.ts
|
third_party/devtools-frontend/src/front_end/panels/timeline/components/SidebarInsightsTab.test.ts
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/chrome/browser/about_flags.cc
|
--- a/chrome/browser/about_flags.cc
|
||||||
+++ b/chrome/browser/about_flags.cc
|
+++ b/chrome/browser/about_flags.cc
|
||||||
@@ -5203,10 +5203,12 @@ const FeatureEntry::FeatureVariation kPr
|
@@ -5210,10 +5210,12 @@ const FeatureEntry::FeatureVariation kPr
|
||||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||||
#include "chrome/browser/bromite_flag_choices.h"
|
#include "chrome/browser/bromite_flag_choices.h"
|
||||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/chrome/browser/about_flags.cc
|
--- a/chrome/browser/about_flags.cc
|
||||||
+++ b/chrome/browser/about_flags.cc
|
+++ b/chrome/browser/about_flags.cc
|
||||||
@@ -5199,7 +5199,13 @@ const FeatureEntry::FeatureVariation kPr
|
@@ -5206,7 +5206,13 @@ const FeatureEntry::FeatureVariation kPr
|
||||||
// calculate and verify checksum.
|
// calculate and verify checksum.
|
||||||
//
|
//
|
||||||
// When adding a new choice, add it to the end of the list.
|
// When adding a new choice, add it to the end of the list.
|
||||||
|
|||||||
@@ -1,69 +1,49 @@
|
|||||||
# Disable some background communication with clients2.google.com
|
# Disable some background communication with clients2.google.com
|
||||||
|
|
||||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
--- a/components/crash/core/app/crash_reporter_client.cc
|
||||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
+++ b/components/crash/core/app/crash_reporter_client.cc
|
||||||
@@ -2683,24 +2683,6 @@ void ChromeContentBrowserClient::AppendE
|
@@ -146,7 +146,7 @@ void CrashReporterClient::GetSanitizatio
|
||||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
|
||||||
client_info->client_id);
|
|
||||||
}
|
|
||||||
-#elif BUILDFLAG(IS_POSIX)
|
|
||||||
-#if !BUILDFLAG(IS_ANDROID)
|
|
||||||
- pid_t pid;
|
|
||||||
- if (crash_reporter::GetHandlerSocket(nullptr, &pid)) {
|
|
||||||
- command_line->AppendSwitchASCII(
|
|
||||||
- crash_reporter::switches::kCrashpadHandlerPid,
|
|
||||||
- base::NumberToString(pid));
|
|
||||||
- }
|
|
||||||
-#endif
|
|
||||||
- std::string switch_value;
|
|
||||||
- std::unique_ptr<metrics::ClientInfo> client_info =
|
|
||||||
- GoogleUpdateSettings::LoadMetricsClientInfo();
|
|
||||||
- if (client_info) {
|
|
||||||
- switch_value = client_info->client_id;
|
|
||||||
- }
|
|
||||||
- switch_value.push_back(',');
|
|
||||||
- switch_value.append(chrome::GetChannelName(chrome::WithExtendedStable(true)));
|
|
||||||
- command_line->AppendSwitchASCII(switches::kEnableCrashReporter, switch_value);
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (logging::DialogsAreSuppressed()) {
|
std::string CrashReporterClient::GetUploadUrl() {
|
||||||
|
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) && defined(OFFICIAL_BUILD)
|
||||||
|
+#if 0
|
||||||
|
return kDefaultUploadURL;
|
||||||
|
#else
|
||||||
|
return std::string();
|
||||||
--- a/components/crash/core/app/crashpad.cc
|
--- a/components/crash/core/app/crashpad.cc
|
||||||
+++ b/components/crash/core/app/crashpad.cc
|
+++ b/components/crash/core/app/crashpad.cc
|
||||||
@@ -72,6 +72,12 @@ void InitializeDatabasePath(const base::
|
@@ -78,6 +78,13 @@ bool InitializeCrashpadImpl(bool initial
|
||||||
}
|
const std::vector<std::string>& initial_arguments,
|
||||||
|
bool embedded_handler,
|
||||||
bool InitializeCrashpadImpl(bool initial_client,
|
const std::vector<base::FilePath>& attachments) {
|
||||||
+ const std::string& a, const std::string& b, const base::FilePath& c,
|
+// Crashpad is needed on Linux because it's used as a WASM signal handler.
|
||||||
+ const std::vector<std::string>& d, bool e, const std::vector<base::FilePath>& f) {
|
+// This is not the case on other platforms, and so it can remain entirely
|
||||||
|
+// disabled there.
|
||||||
|
+#if !BUILDFLAG(IS_LINUX)
|
||||||
+ return false;
|
+ return false;
|
||||||
+}
|
+#endif
|
||||||
+[[maybe_unused]]
|
+
|
||||||
+bool DeadInitializeCrashpadImpl(bool initial_client,
|
static bool initialized = false;
|
||||||
const std::string& process_type,
|
DCHECK(!initialized);
|
||||||
const std::string& user_data_dir,
|
initialized = true;
|
||||||
const base::FilePath& exe_path,
|
--- a/third_party/crashpad/crashpad/handler/handler_main.cc
|
||||||
--- a/components/gwp_asan/client/gwp_asan.cc
|
+++ b/third_party/crashpad/crashpad/handler/handler_main.cc
|
||||||
+++ b/components/gwp_asan/client/gwp_asan.cc
|
@@ -875,7 +875,7 @@ int HandlerMain(int argc,
|
||||||
@@ -344,6 +344,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
|
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
|
||||||
|
// BUILDFLAG(IS_ANDROID)
|
||||||
// Exported for testing.
|
case kOptionURL: {
|
||||||
GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(
|
- options.url = optarg;
|
||||||
+ const base::Feature& a, bool b, std::string_view c) {
|
+ options.url = "";
|
||||||
+ return std::nullopt;
|
break;
|
||||||
+}
|
}
|
||||||
+[[maybe_unused]]
|
#if BUILDFLAG(IS_CHROMEOS)
|
||||||
+std::optional<AllocatorSettings> DeadGetAllocatorSettings(
|
@@ -1016,7 +1016,7 @@ int HandlerMain(int argc,
|
||||||
const base::Feature& feature,
|
|
||||||
bool boost_sampling,
|
|
||||||
std::string_view process_type) {
|
|
||||||
--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
|
|
||||||
+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
|
|
||||||
@@ -747,8 +747,6 @@ void CrashpadClient::CrashWithoutDump(co
|
|
||||||
// static
|
|
||||||
void CrashpadClient::SetFirstChanceExceptionHandler(
|
|
||||||
FirstChanceHandler handler) {
|
|
||||||
- DCHECK(SignalHandler::Get());
|
|
||||||
- SignalHandler::Get()->SetFirstChanceHandler(handler);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// static
|
ScopedStoppable upload_thread;
|
||||||
|
- if (!options.url.empty()) {
|
||||||
|
+ if ((false)) {
|
||||||
|
// TODO(scottmg): options.rate_limit should be removed when we have a
|
||||||
|
// configurable database setting to control upload limiting.
|
||||||
|
// See https://crashpad.chromium.org/bug/23.
|
||||||
|
|||||||
@@ -1603,6 +1603,29 @@
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
--- a/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
|
||||||
|
+++ b/chrome/browser/ui/safety_hub/abusive_notification_permissions_manager.cc
|
||||||
|
@@ -108,20 +108,7 @@ safe_browsing::NotificationRevocationSou
|
||||||
|
// suspicious notification.
|
||||||
|
bool HasShowOriginalSuspiciousNotification(HostContentSettingsMap* hcsm,
|
||||||
|
GURL url) {
|
||||||
|
- DCHECK(hcsm);
|
||||||
|
- DCHECK(url.is_valid());
|
||||||
|
- base::Value stored_value(hcsm->GetWebsiteSetting(
|
||||||
|
- url, url, ContentSettingsType::SUSPICIOUS_NOTIFICATION_SHOW_ORIGINAL));
|
||||||
|
-
|
||||||
|
- if (stored_value.is_none()) {
|
||||||
|
return false;
|
||||||
|
- }
|
||||||
|
- DCHECK(stored_value.is_dict());
|
||||||
|
- DCHECK(stored_value.GetDict().contains(
|
||||||
|
- safe_browsing::kSuspiciousNotificationShowOriginalKey));
|
||||||
|
- return stored_value.GetDict()
|
||||||
|
- .FindBool(safe_browsing::kSuspiciousNotificationShowOriginalKey)
|
||||||
|
- .value_or(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return true if the url should be considered for suspicious content
|
||||||
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
--- a/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||||
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
+++ b/chrome/browser/ui/safety_hub/revoked_permissions_service.cc
|
||||||
@@ -41,7 +41,6 @@
|
@@ -41,7 +41,6 @@
|
||||||
|
|||||||
@@ -48,6 +48,16 @@
|
|||||||
]
|
]
|
||||||
|
|
||||||
# Disallow depending on content.
|
# Disallow depending on content.
|
||||||
|
--- a/components/contextual_tasks/internal/BUILD.gn
|
||||||
|
+++ b/components/contextual_tasks/internal/BUILD.gn
|
||||||
|
@@ -43,6 +43,7 @@ source_set("internal") {
|
||||||
|
"//components/sync/model",
|
||||||
|
"//components/url_formatter",
|
||||||
|
"//net",
|
||||||
|
+ "//third_party/re2",
|
||||||
|
"//ui/gfx",
|
||||||
|
"//url",
|
||||||
|
]
|
||||||
--- a/content/browser/BUILD.gn
|
--- a/content/browser/BUILD.gn
|
||||||
+++ b/content/browser/BUILD.gn
|
+++ b/content/browser/BUILD.gn
|
||||||
@@ -119,6 +119,7 @@ source_set("browser") {
|
@@ -119,6 +119,7 @@ source_set("browser") {
|
||||||
|
|||||||
Reference in New Issue
Block a user