[AUTO] Patches auto-rebase for master branch (#2394)

[AUTO] Patches auto-rebase for master branch
This commit is contained in:
uazo
2025-10-09 09:12:52 -08:00
committed by GitHub
16 changed files with 36 additions and 36 deletions
@@ -206,7 +206,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#if BUILDFLAG(ENABLE_BACKGROUND_MODE)
#include "chrome/browser/background/extensions/background_mode_manager.h"
#endif
@@ -1685,6 +1687,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1692,6 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
component_updater::RegisterPrefs(registry);
domain_reliability::RegisterPrefs(registry);
embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
@@ -1747,7 +1747,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
#include "chrome/browser/android/oom_intervention/oom_intervention_decider.h"
#include "chrome/browser/android/preferences/browser_prefs_android.h"
@@ -2138,6 +2139,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2145,6 +2146,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry);
webapps::InstallPromptPrefs::RegisterProfilePrefs(registry);
@@ -1009,7 +1009,7 @@ diff --git a/chrome/browser/unexpire_flags.cc b/chrome/browser/unexpire_flags.cc
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc
--- a/chrome/common/chrome_features.cc
+++ b/chrome/common/chrome_features.cc
@@ -1612,5 +1612,5 @@ BASE_FEATURE(DisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1623,5 +1623,5 @@ BASE_FEATURE(DisableShortcutsEnableDiy, base::FEATURE_ENABLED_BY_DEFAULT);
// happen silently without prompting an updating dialog.
BASE_FEATURE(SilentPolicyAndDefaultAppUpdating,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2063,7 +2063,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2566,4 +2566,5 @@ bool IsXrDevice() {
@@ -2569,4 +2569,5 @@ bool IsXrDevice() {
//
// DO NOT ADD NEW FEATURES HERE.
@@ -2072,7 +2072,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
--- a/third_party/blink/public/common/features.h
+++ b/third_party/blink/public/common/features.h
@@ -1903,6 +1903,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
@@ -1908,6 +1908,7 @@ BLINK_COMMON_EXPORT bool IsXrDevice();
//
// DO NOT ADD NEW FEATURES HERE.
+17 -17
View File
@@ -2044,7 +2044,7 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5
diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_proxy.cc b/third_party/blink/renderer/platform/widget/input/input_handler_proxy.cc
--- a/third_party/blink/renderer/platform/widget/input/input_handler_proxy.cc
+++ b/third_party/blink/renderer/platform/widget/input/input_handler_proxy.cc
@@ -37,6 +37,7 @@
@@ -38,6 +38,7 @@
#include "third_party/blink/public/common/input/web_mouse_wheel_event.h"
#include "third_party/blink/public/common/input/web_pointer_event.h"
#include "third_party/blink/public/common/input/web_touch_event.h"
@@ -2052,7 +2052,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
#include "third_party/blink/renderer/platform/widget/input/compositor_thread_event_queue.h"
#include "third_party/blink/renderer/platform/widget/input/cursor_control_handler.h"
#include "third_party/blink/renderer/platform/widget/input/elastic_overscroll_controller.h"
@@ -57,6 +58,20 @@ namespace {
@@ -58,6 +59,20 @@ namespace {
using ::perfetto::protos::pbzero::ChromeLatencyInfo2;
using ::perfetto::protos::pbzero::TrackEvent;
@@ -2073,7 +2073,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
cc::ScrollStateData CreateScrollStateDataForGesture(
const WebGestureEvent& event) {
cc::ScrollStateData scroll_state_data;
@@ -65,8 +80,8 @@ cc::ScrollStateData CreateScrollStateDataForGesture(
@@ -66,8 +81,8 @@ cc::ScrollStateData CreateScrollStateDataForGesture(
}
switch (event.GetType()) {
case WebInputEvent::Type::kGestureScrollBegin:
@@ -2084,7 +2084,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
scroll_state_data.delta_x_hint = -event.data.scroll_begin.delta_x_hint;
scroll_state_data.delta_y_hint = -event.data.scroll_begin.delta_y_hint;
scroll_state_data.is_beginning = true;
@@ -841,7 +856,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -865,7 +880,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
const WebGestureEvent& gesture_event =
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureBegin(
@@ -2093,7 +2093,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
GestureScrollInputType(gesture_event.SourceDevice()));
gesture_pinch_in_progress_ = true;
return DID_HANDLE;
@@ -853,7 +868,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -877,7 +892,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
const WebGestureEvent& gesture_event =
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureEnd(
@@ -2102,7 +2102,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_HANDLE;
}
@@ -863,7 +878,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -887,7 +902,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
static_cast<const WebGestureEvent&>(event);
input_handler_->PinchGestureUpdate(
gesture_event.data.pinch_update.scale,
@@ -2111,7 +2111,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_HANDLE;
}
@@ -886,7 +901,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -910,7 +925,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
// TODO(arakeri): Pass in the modifier instead of a bool once the
// refactor (crbug.com/1022097) is done. For details, see
// crbug.com/1016955.
@@ -2120,7 +2120,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
}
return DID_NOT_HANDLE;
@@ -897,7 +912,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -921,7 +936,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
static_cast<const WebMouseEvent&>(event);
CHECK(input_handler_);
if (mouse_event.button == WebMouseEvent::Button::kLeft)
@@ -2129,7 +2129,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return DID_NOT_HANDLE;
}
case WebInputEvent::Type::kMouseMove: {
@@ -912,7 +927,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
@@ -936,7 +951,7 @@ InputHandlerProxy::RouteToTypeSpecificHandler(
(mouse_event.button == WebPointerProperties::Button::kNoButton &&
!(mouse_event.GetModifiers() &
WebInputEvent::Modifiers::kRelativeMotionEvent));
@@ -2138,7 +2138,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
should_cancel_scrollbar_drag);
return DID_NOT_HANDLE;
}
@@ -951,12 +966,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
@@ -975,12 +990,14 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
// to check pointer lock state
gfx::PointF point =
static_cast<const WebMouseEvent&>(event).PositionInWidget();
@@ -2153,7 +2153,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
return WebInputEventAttribution(
WebInputEventAttribution::kTargetedFrame,
input_handler_->FindFrameElementIdAtPoint(point));
@@ -971,6 +988,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
@@ -995,6 +1012,7 @@ WebInputEventAttribution InputHandlerProxy::PerformEventAttribution(
// how the renderer host performs touch event dispatch.
// https://cs.chromium.org/chromium/src/content/browser/renderer_host/render_widget_host_input_event_router.cc?l=808&rcl=10fe9d0a725d4ed7b69266a5936c525f0a5b26d3
gfx::PointF point = touch_event.touches[0].PositionInWidget();
@@ -2161,7 +2161,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
const cc::ElementId targeted_element =
input_handler_->FindFrameElementIdAtPoint(point);
@@ -1072,7 +1090,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
@@ -1096,7 +1114,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleMouseWheel(
}
}
@@ -2170,7 +2170,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
if (input_handler_->HasBlockingWheelEventHandlerAt(
gfx::Point(position_in_widget.x(), position_in_widget.y()))) {
result = DID_NOT_HANDLE;
@@ -1241,7 +1259,7 @@ InputHandlerProxy::HandleGestureScrollUpdate(
@@ -1265,7 +1283,7 @@ InputHandlerProxy::HandleGestureScrollUpdate(
scroll_data->set_unused_delta_y(scroll_result.unused_scroll_delta.y());
});
@@ -2179,7 +2179,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
if (elastic_overscroll_controller_)
HandleScrollElasticityOverscroll(gesture_event, scroll_result);
@@ -1319,8 +1337,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent(
@@ -1343,8 +1361,8 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HitTestTouchEvent(
cc::TouchAction touch_action = cc::TouchAction::kAuto;
cc::InputHandler::TouchStartOrMoveEventListenerType event_listener_type =
input_handler_->EventListenerTypeForTouchStartOrMoveAt(
@@ -2190,7 +2190,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
&touch_action);
if (allowed_touch_action && touch_action != cc::TouchAction::kAuto) {
TRACE_EVENT_INSTANT1("input", "Adding TouchAction",
@@ -1426,7 +1444,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
@@ -1450,7 +1468,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchStart(
touch_event.touches_length == 1) {
DCHECK(touch_event.touches[0].state == WebTouchPoint::State::kStatePressed);
cc::InputHandlerPointerResult pointer_result = HandlePointerDown(
@@ -2199,7 +2199,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) {
client_->SetAllowedTouchAction(allowed_touch_action);
return DID_HANDLE;
@@ -1489,7 +1507,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove(
@@ -1513,7 +1531,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchMove(
touch_event.touch_start_or_first_touch_move);
if (touch_event.touches_length == 1) {
cc::InputHandlerPointerResult pointer_result = HandlePointerMove(
@@ -2208,7 +2208,7 @@ diff --git a/third_party/blink/renderer/platform/widget/input/input_handler_prox
false /* should_cancel_scrollbar_drag */);
if (pointer_result.type == cc::PointerResultType::kScrollbarScroll) {
return DID_HANDLE;
@@ -1532,7 +1550,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd(
@@ -1556,7 +1574,7 @@ InputHandlerProxy::EventDisposition InputHandlerProxy::HandleTouchEnd(
touch_event.touches_length);
if (touch_event.touches_length == 1) {
cc::InputHandlerPointerResult pointer_result = HandlePointerUp(
+1 -1
View File
@@ -1727,7 +1727,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/lens/lens_overlay_query_controller.cc b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
--- a/chrome/browser/ui/lens/lens_overlay_query_controller.cc
+++ b/chrome/browser/ui/lens/lens_overlay_query_controller.cc
@@ -709,6 +709,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
@@ -712,6 +712,7 @@ LensOverlayQueryController::CreateEndpointFetcher(
/*post_data=*/std::move(request_string),
/*headers=*/request_headers,
/*cors_exempt_headers=*/cors_exempt_headers, chrome::GetChannel(),
+1 -1
View File
@@ -13,7 +13,7 @@ Real-box is search box in ntp
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -2352,7 +2352,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2359,7 +2359,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterBooleanPref(
prefs::kLensRegionSearchEnabled, true,
user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
@@ -376,7 +376,7 @@ diff --git a/chrome/browser/preloading/prefetch/search_prefetch/search_prefetch_
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -1197,7 +1197,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1201,7 +1201,6 @@ void ChromeBrowserMainExtraPartsProfiles::
base::FeatureList::IsEnabled(
permissions::features::kPermissionOnDeviceGeolocationPredictions) ||
base::FeatureList::IsEnabled(permissions::features::kPermissionsAIv1)) {
+1 -1
View File
@@ -479,7 +479,7 @@ new file mode 100644
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
--- a/third_party/blink/common/features.cc
+++ b/third_party/blink/common/features.cc
@@ -2510,6 +2510,7 @@ BASE_FEATURE(XrDevice, base::FEATURE_DISABLED_BY_DEFAULT);
@@ -2513,6 +2513,7 @@ BASE_FEATURE(XrDevice, base::FEATURE_DISABLED_BY_DEFAULT);
// constants for features in the section above.
bool IsAllowURNsInIframeEnabled() {
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1945,7 +1945,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1952,7 +1952,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
registry->RegisterBooleanPref(prefs::kUiAutomationProviderEnabled, false);
#endif
@@ -374,7 +374,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#else // BUILDFLAG(IS_ANDROID)
#include "chrome/browser/contextual_cueing/contextual_cueing_prefs.h"
#include "chrome/browser/gcm/gcm_product_util.h"
@@ -2084,6 +2085,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2091,6 +2092,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry);
omnibox::RegisterProfilePrefs(registry);
ZeroSuggestProvider::RegisterProfilePrefs(registry);
@@ -400,7 +400,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -591,6 +591,11 @@
@@ -592,6 +592,11 @@
#include "chrome/browser/net/nss_service_factory.h"
#endif
@@ -412,7 +412,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsProfiles>());
}
@@ -1428,6 +1433,10 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1432,6 +1437,10 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
WebDataServiceFactory::GetInstance();
webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
+1 -1
View File
@@ -1202,7 +1202,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "components/adblock/content/browser/factories/content_security_policy_injector_factory.h"
#include "components/adblock/content/browser/factories/element_hider_factory.h"
#include "components/adblock/content/browser/factories/resource_classification_runner_factory.h"
@@ -945,7 +944,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -946,7 +945,6 @@ void ChromeBrowserMainExtraPartsProfiles::
// Makes manual testing possible.
FakeSmartCardDeviceServiceFactory::GetInstance();
#endif
@@ -10,7 +10,7 @@ Subject: Keep Manta Service Disabled
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -1019,7 +1019,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1023,7 +1023,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#if !BUILDFLAG(IS_ANDROID)
ManagedConfigurationAPIFactory::GetInstance();
#endif
@@ -2130,7 +2130,7 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.x
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -2395,7 +2395,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2402,7 +2402,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
#if BUILDFLAG(IS_ANDROID)
registry->RegisterBooleanPref(prefs::kVirtualKeyboardResizesLayoutByDefault,
@@ -442,7 +442,7 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/re
allow_circular_includes_from = [
"//third_party/blink/renderer/platform/blob",
@@ -1839,6 +1841,7 @@ component("platform") {
@@ -1840,6 +1842,7 @@ component("platform") {
"//third_party/blink/public/strings",
"//third_party/blink/renderer/platform/wtf",
"//third_party/ced",
@@ -391,7 +391,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/permissions/notifications_engagement_service_factory.h"
#include "chrome/browser/permissions/one_time_permissions_tracker_factory.h"
#include "chrome/browser/permissions/origin_keyed_permission_action_service_factory.h"
@@ -1105,6 +1106,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -1109,6 +1110,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(BUILD_WITH_TFLITE_LIB)
OnDeviceTailModelServiceFactory::GetInstance();
#endif
@@ -3656,7 +3656,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "components/autofill/content/browser/autofill_log_router_factory.h"
#include "components/breadcrumbs/core/breadcrumbs_status.h"
#include "components/captive_portal/core/buildflags.h"
@@ -932,6 +945,15 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -933,6 +946,15 @@ void ChromeBrowserMainExtraPartsProfiles::
// Makes manual testing possible.
FakeSmartCardDeviceServiceFactory::GetInstance();
#endif