Patches for 109.0.5414.80

109.0.5414.80: git apply result for next-v109 branch
This commit is contained in:
uazo
2023-01-09 14:24:50 +01:00
committed by GitHub
14 changed files with 26 additions and 26 deletions
@@ -45,7 +45,7 @@ Subject: 109 Move navigation bar to bottom fixup
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -1134,7 +1134,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1112,7 +1112,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
@@ -11,7 +11,7 @@ Subject: Guard for user-agent reduction (add fixup)
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1551,7 +1551,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
@@ -1554,7 +1554,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
registry->RegisterIntegerPref(
prefs::kUserAgentReduction,
static_cast<int>(
@@ -4,7 +4,7 @@ Subject: Partitioning all cookies by top frame domain
Enables cookie partitioning by top frame etld, respecting the
user's possible wish to disable all third-party cookies.
Disabling the flag via the ui restores the normal mode, where
Disabling the flag via the ui restores the normal mode, where
samesite=none first-party cookies are sent in third-party contexts.
---
components/browsing_data/core/features.cc | 2 +-
@@ -110,7 +110,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -2815,7 +2815,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2818,7 +2818,6 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kForcePNaClSubzero,
#endif
switches::kForceUIDirection,
@@ -118,7 +118,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
switches::kJavaScriptHarmony,
switches::kEnableExperimentalWebAssemblyFeatures,
embedder_support::kOriginTrialDisabledFeatures,
@@ -4794,12 +4793,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4797,12 +4796,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -131,7 +131,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
if (auto* throttle_manager =
subresource_filter::ContentSubresourceFilterThrottleManager::
FromNavigationHandle(*handle)) {
@@ -5296,11 +5289,11 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
@@ -5299,11 +5292,11 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
profile->GetPrefs()->GetString(prefs::kAllowedDomainsForApps),
false /*-> allow_userscript, don't care */};
@@ -83,7 +83,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -3231,6 +3231,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
@@ -3234,6 +3234,9 @@ bool ChromeContentBrowserClient::IsAttributionReportingOperationAllowed(
const url::Origin* source_origin,
const url::Origin* destination_origin,
const url::Origin* reporting_origin) {
+7 -7
View File
@@ -605,7 +605,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
void MaybeAddThrottles(
std::vector<std::unique_ptr<content::NavigationThrottle>> additional,
std::vector<std::unique_ptr<content::NavigationThrottle>>* combined) {
@@ -2503,7 +2493,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2506,7 +2496,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
}
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
@@ -614,7 +614,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -4895,6 +4885,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4898,6 +4888,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -622,7 +622,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// g_browser_process->safe_browsing_service() may be null in unittests.
safe_browsing::SafeBrowsingUIManager* ui_manager =
g_browser_process->safe_browsing_service()
@@ -4910,6 +4901,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4913,6 +4904,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
handle));
}
@@ -630,7 +630,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -5150,7 +5142,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
@@ -5153,7 +5145,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -640,7 +640,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// Initialize `network_contexts_parent_directory_`.
base::FilePath user_data_dir;
@@ -6329,6 +6323,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
@@ -6332,6 +6326,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -648,7 +648,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// Should not bypass safe browsing check if the check is for enterprise
// lookup.
if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled)
@@ -6349,6 +6344,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
@@ -6352,6 +6347,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
}
return safe_browsing_url_checker_delegate_;
@@ -658,7 +658,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6356,24 +6354,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
@@ -6359,24 +6357,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
content::BrowserContext* browser_context,
bool is_enterprise_lookup_enabled,
bool is_consumer_lookup_enabled) {
@@ -98,7 +98,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/select
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -3088,6 +3088,21 @@
@@ -3103,6 +3103,21 @@
]
}
],
+2 -2
View File
@@ -109,7 +109,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/media/audio_service_util.h"
#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/webrtc/audio_debug_recordings_handler.h"
@@ -4723,16 +4722,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4726,16 +4725,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
content::NavigationHandle* handle) {
std::vector<std::unique_ptr<content::NavigationThrottle>> throttles;
@@ -126,7 +126,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
MaybeAddThrottle(
SupervisedUserNavigationThrottle::MaybeCreateThrottleFor(handle),
@@ -4817,10 +4806,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -4820,10 +4809,6 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
throttle_manager->MaybeAppendNavigationThrottles(handle, &throttles);
}
@@ -31,7 +31,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1501,7 +1501,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
@@ -1504,7 +1504,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
registry->RegisterFilePathPref(prefs::kDiskCacheDir, base::FilePath());
registry->RegisterIntegerPref(prefs::kDiskCacheSize, 0);
registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -40,7 +40,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
registry->RegisterBooleanPref(prefs::kTabFreezingEnabled, true);
registry->RegisterIntegerPref(prefs::kSCTAuditingHashdanceReportCount, 0);
}
@@ -1515,7 +1515,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
@@ -1518,7 +1518,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
// user policy in addition to the same named ones in Local State (which are
// used for mapping the command-line flags).
registry->RegisterStringPref(prefs::kIsolateOrigins, std::string());
@@ -359,7 +359,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -5294,7 +5294,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
@@ -5297,7 +5297,8 @@ ChromeContentBrowserClient::CreateURLLoaderThrottles(
chrome::mojom::DynamicParams dynamic_params = {
profile->GetPrefs()->GetBoolean(prefs::kForceGoogleSafeSearch),
profile->GetPrefs()->GetInteger(prefs::kForceYouTubeRestrict),
@@ -65,7 +65,7 @@ diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/brows
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -1511,7 +1511,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
@@ -1514,7 +1514,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePrefs(
void ChromeContentBrowserClient::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
@@ -152,7 +152,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -90,6 +90,9 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -86,6 +86,9 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.util.ColorUtils;
@@ -162,7 +162,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
/** The mediator implements the logic to interact with the surfaces and caller. */
class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
StartSurface.OnTabSelectingListener, BackPressHandler,
@@ -1131,6 +1134,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1109,6 +1112,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
@@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -438,8 +438,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -434,8 +434,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// Initialize
// Note that isVoiceSearchEnabled will return false in incognito mode.
@@ -38,7 +38,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
boolean shouldShowLensButton = mOmniboxStub.isLensEnabled(LensEntryPoint.TASKS_SURFACE);
LensMetrics.recordShown(LensEntryPoint.TASKS_SURFACE, shouldShowLensButton);
mPropertyModel.set(IS_LENS_BUTTON_VISIBLE, shouldShowLensButton);
@@ -1199,10 +1198,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1177,10 +1176,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// incorrect state if check synchronously.
ThreadUtils.postOnUiThread(() -> {
if (mOmniboxStub != null) {
@@ -423,7 +423,7 @@ diff --git a/components/ntp_snippets/features.cc b/components/ntp_snippets/featu
diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json
--- a/testing/variations/fieldtrial_testing_config.json
+++ b/testing/variations/fieldtrial_testing_config.json
@@ -5413,6 +5413,24 @@
@@ -5428,6 +5428,24 @@
]
}
],