Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/RELEASE
Original file line number Diff line number Diff line change
@@ -1 +1 @@
145.0.7632.120
146.0.7680.111
3 changes: 0 additions & 3 deletions build/cromite.gn_args
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ enable_request_header_integrity = false
# Disable precompiled headers because they are incompatible with the unsafe_buffers configuration
enable_precompiled_headers = false

# Disable integration with Gemini
enable_glic = false

# Disable TFLite with XNNPACK
build_tflite_with_xnnpack = false

Expand Down
12 changes: 6 additions & 6 deletions build/patches/Add-AllowUserCertificates-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -260,6 +260,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -255,6 +255,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.SelectionPopupController;
import org.chromium.content_public.browser.WebContents;
import org.chromium.content_public.common.ContentSwitches;
+import org.chromium.net.X509Util;
import org.chromium.printing.PrintManagerDelegateImpl;
import org.chromium.printing.PrintingController;
import org.chromium.printing.PrintingControllerImpl;
@@ -1118,6 +1119,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -1125,6 +1126,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
super.onStartWithNative();

ChromeActivitySessionTracker.getInstance().onStartWithNative(getProfileProviderSupplier());
Expand All @@ -40,7 +40,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -196,6 +196,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -202,6 +202,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedNoViewCache,
&feed::kFeedPerformanceStudy,
&feed::kFeedRecyclerBinderUnmountOnDetach,
Expand All @@ -58,8 +58,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
+ public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
"AdaptiveButtonInTopToolbarPageSummary";
public static final String ANDROID_ANIMATED_PROGRESS_BAR_IN_BROWSER =
@@ -795,6 +796,8 @@ public abstract class ChromeFeatureList {
// Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by
@@ -797,6 +798,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
Expand All @@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final CachedFlag sAppSpecificHistoryViewIntent =
newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
public static final CachedFlag sAsyncNotificationManager =
@@ -1121,6 +1124,7 @@ public abstract class ChromeFeatureList {
@@ -1131,6 +1134,7 @@ public abstract class ChromeFeatureList {
// keep-sorted start
sAccountForSuppressedKeyboardInsets,
sAndroidAnimatedProgressBarInBrowser,
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-Alt-D-hotkey-to-focus-address-bar.patch
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/KeyboardShortcuts.java
@@ -917,6 +917,12 @@ public class KeyboardShortcuts {
@@ -941,6 +941,12 @@ public class KeyboardShortcuts {
KeyEvent.KEYCODE_ESCAPE,
KeyEvent.META_CTRL_ON);
}
Expand Down
2 changes: 1 addition & 1 deletion build/patches/Add-IsCleartextPermitted-flag.patch
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ new file mode 100644
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -401,6 +401,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
@@ -403,6 +403,11 @@ std::unique_ptr<URLRequestJob> URLRequestHttpJob::Create(URLRequest* request) {
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/base/features.cc b/base/features.cc
--- a/base/features.cc
+++ b/base/features.cc
@@ -202,6 +202,10 @@ bool IsReducePPMsEnabled() {
@@ -197,6 +197,10 @@ bool IsReducePPMsEnabled() {
return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
}

Expand Down
8 changes: 4 additions & 4 deletions build/patches/Add-a-flag-to-disable-GamePad-API.patch
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
diff --git a/content/child/runtime_features.cc b/content/child/runtime_features.cc
--- a/content/child/runtime_features.cc
+++ b/content/child/runtime_features.cc
@@ -264,6 +264,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
@@ -266,6 +266,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
{wf::EnablePaymentApp, raw_ref(features::kServiceWorkerPaymentApps)},
{wf::EnablePeriodicBackgroundSync,
raw_ref(features::kPeriodicBackgroundSync)},
Expand All @@ -40,7 +40,7 @@ new file mode 100644
diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/public/cpp/gamepad_features.cc
--- a/device/gamepad/public/cpp/gamepad_features.cc
+++ b/device/gamepad/public/cpp/gamepad_features.cc
@@ -53,4 +53,12 @@ bool IsGamepadMultitouchEnabled() {
@@ -59,4 +59,12 @@ bool IsGamepadMultitouchEnabled() {
return false;
}

Expand All @@ -64,8 +64,8 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/publi

#if BUILDFLAG(IS_WIN)
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kIgnorePS5GamepadsInWgi);
@@ -27,6 +28,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kAllowlistHidrawGamepads);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -32,6 +33,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
#endif // BUILDFLAG(IS_APPLE)

GAMEPAD_FEATURES_EXPORT bool IsGamepadMultitouchEnabled();
+GAMEPAD_FEATURES_EXPORT bool IsRestrictGamepadAccessEnabled();
Expand Down
Loading
Loading