mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
merge: update to chromium 142.0.7444.162 (#433)
This commit is contained in:
@@ -1 +1 @@
|
||||
142.0.7444.134
|
||||
142.0.7444.162
|
||||
|
||||
@@ -693,7 +693,7 @@
|
||||
std::vector<base::CallbackListSubscription> tab_subscriptions_;
|
||||
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
@@ -752,39 +752,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
@@ -786,39 +786,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
.SetBubbleIcon(kLightbulbOutlineIcon)
|
||||
.SetBubbleTitleText(IDS_PASSWORD_MANAGER_IPH_CREATE_SHORTCUT_TITLE)));
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "components/translate/core/browser/translate_download_manager.h"
|
||||
#include "components/translate/core/browser/translate_manager.h"
|
||||
#include "components/translate/core/browser/translate_prefs.h"
|
||||
@@ -2240,6 +2241,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2239,6 +2240,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
}
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
#include "third_party/skia/include/core/SkImage.h"
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2344,6 +2344,12 @@
|
||||
@@ -2350,6 +2350,12 @@
|
||||
status: "stable",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -314,7 +314,7 @@ approach to change color components.
|
||||
SkJpegEncoder::Options options;
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2350,6 +2350,9 @@
|
||||
@@ -2356,6 +2356,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
#include "third_party/blink/public/common/permissions_policy/document_policy_features.h"
|
||||
#include "third_party/blink/public/common/switches.h"
|
||||
#include "third_party/blink/public/mojom/fetch/fetch_api_request.mojom-blink.h"
|
||||
@@ -611,6 +612,8 @@ void FrameFetchContext::ModifyRequestFor
|
||||
@@ -613,6 +614,8 @@ void FrameFetchContext::ModifyRequestFor
|
||||
void FrameFetchContext::AddClientHintsIfNecessary(
|
||||
const std::optional<float> resource_width,
|
||||
ResourceRequest& request) {
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
if (editable) {
|
||||
AppendOtherEditableItems();
|
||||
}
|
||||
@@ -2214,7 +2209,6 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2213,7 +2208,6 @@ void RenderViewContextMenu::AppendPageIt
|
||||
IDS_CONTENT_CONTEXT_SAVEPAGEAS);
|
||||
menu_model_.AddItemWithStringId(IDC_PRINT, IDS_CONTENT_CONTEXT_PRINT);
|
||||
AppendLiveCaptionItem();
|
||||
@@ -20,7 +20,7 @@
|
||||
if (IsRegionSearchEnabled()) {
|
||||
AppendRegionSearchItem();
|
||||
}
|
||||
@@ -2343,8 +2337,7 @@ void RenderViewContextMenu::AppendMediaR
|
||||
@@ -2342,8 +2336,7 @@ void RenderViewContextMenu::AppendMediaR
|
||||
|
||||
void RenderViewContextMenu::AppendReadAnythingItem() {
|
||||
// Show Read Anything option if it's not already open in the side panel.
|
||||
@@ -30,7 +30,7 @@
|
||||
menu_model_.AddItemWithStringId(IDC_CONTENT_CONTEXT_OPEN_IN_READING_MODE,
|
||||
IDS_CONTENT_CONTEXT_READING_MODE);
|
||||
}
|
||||
@@ -3620,10 +3613,12 @@ void RenderViewContextMenu::ExecuteComma
|
||||
@@ -3619,10 +3612,12 @@ void RenderViewContextMenu::ExecuteComma
|
||||
}
|
||||
|
||||
void RenderViewContextMenu::AddSpellCheckServiceItem(bool is_checked) {
|
||||
@@ -43,7 +43,7 @@
|
||||
if (is_checked) {
|
||||
menu_model_.AddCheckItemWithStringId(
|
||||
IDC_CONTENT_CONTEXT_ACCESSIBILITY_LABELS_TOGGLE,
|
||||
@@ -4000,6 +3995,8 @@ bool RenderViewContextMenu::IsVideoFrame
|
||||
@@ -3999,6 +3994,8 @@ bool RenderViewContextMenu::IsVideoFrame
|
||||
bool RenderViewContextMenu::AppendQRCodeGeneratorItem(bool for_image,
|
||||
bool draw_icon,
|
||||
bool add_separator) {
|
||||
|
||||
@@ -25,7 +25,7 @@ Cr-Commit-Position: refs/heads/main@{#1543516}
|
||||
|
||||
--- a/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
||||
+++ b/components/remote_cocoa/app_shim/native_widget_mac_nswindow.mm
|
||||
@@ -357,6 +357,16 @@
|
||||
@@ -357,6 +357,16 @@ struct NSEdgeAndCornerThicknesses {
|
||||
return frameRect;
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ Cr-Commit-Position: refs/heads/main@{#1543516}
|
||||
// Overlay windows are used to render top chrome components while in immersive
|
||||
// fullscreen. Those rendered views are hosted in a separate AppKit controlled
|
||||
// window. The overlay windows are a transparent overlay on top of the AppKit
|
||||
@@ -28,19 +26,6 @@
|
||||
@@ -28,19 +26,6 @@ constexpr unsigned long kAllowedCollecti
|
||||
kAllowedCollectionBehaviorMask];
|
||||
}
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
4
|
||||
5
|
||||
|
||||
Reference in New Issue
Block a user