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 @@
147.0.7727.102
148.0.7778.120
4 changes: 2 additions & 2 deletions build/cromite.gn_args
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
android_channel="stable"
blink_symbol_level=1
build_contextual_search=false
build_with_tflite_lib=false
chrome_pgo_phase=0
dcheck_always_on=false
disable_fieldtrial_testing_config=true
Expand All @@ -20,7 +19,6 @@ rtc_build_examples=false
symbol_level=1
treat_warnings_as_errors=true
use_debug_fission=true
use_errorprone_java_compiler=false
use_official_google_api_keys=false
use_rtti=false
enable_arcore=false
Expand Down Expand Up @@ -101,6 +99,8 @@ if (target_os == "android") {

chrome_pgo_phase = 2 # enable pgo

use_errorprone_java_compiler = false

# do not split Developer UI split into a separate Dynamic Feature Module
dfmify_dev_ui = false

Expand Down
4 changes: 3 additions & 1 deletion build/cromite_patches_list.txt
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,9 @@ Disable-device-bound-session.patch
Keep-disabled-CpuPerformance.patch
Immediately-destroy-shared-workers-when-closing-the-page.patch
Disable-minikin-hyphenation.patch
Disable-integration-with-Gemini.patch
Disable-AppRating.patch
Enable-Android-DevTools-Frontend.patch

# temporary or wip patches
Temp-disable-predictive-back-gesture.patch
Expand All @@ -316,7 +319,6 @@ Block-leakage-of-urls-in-sandbox-iframes.patch
Fix-chromium-build-bugs.patch
Try-to-fix-2082.patch
Temp-use-PREVIEW-for-IDCompositionDevice5.patch
Disable-integration-with-Gemini.patch

# adblock patches
eyeo-133.0.6943.49-base.patch
Expand Down
22 changes: 11 additions & 11 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
@@ -255,6 +255,7 @@ import org.chromium.content_public.browser.LoadUrlParams;
@@ -256,6 +256,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;
@@ -1134,6 +1135,8 @@ public abstract class ChromeActivity extends AsyncInitializationActivity
@@ -1137,6 +1138,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
@@ -204,6 +204,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -206,6 +206,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&feed::kFeedNoViewCache,
&feed::kFeedPerformanceStudy,
&feed::kFeedRecyclerBinderUnmountOnDetach,
Expand All @@ -51,31 +51,31 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -167,6 +167,7 @@ public abstract class ChromeFeatureList {
@@ -168,6 +168,7 @@ public abstract class ChromeFeatureList {
"AccountForSuppressedKeyboardInsets";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
"AdaptiveButtonInTopToolbarCustomizationV2";
+ public static final String ALLOW_USER_CERTIFICATES = "AllowUserCertificates";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =
"AdaptiveButtonInTopToolbarPageSummary";
// Don't clean up this flag yet, BCIV is launched, so this needs to be enabled by
@@ -803,6 +804,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sAndroidWindowPopupResizeAfterSpawn =
newCachedFlag(ANDROID_WINDOW_POPUP_RESIZE_AFTER_SPAWN, false, true);
@@ -836,6 +837,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sAndroidXrImmersivePlayer =
newCachedFlag(ANDROID_XR_IMMERSIVE_PLAYER, false);
public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
+ public static final CachedFlag sAllowUserCertificates =
+ newCachedFlag(ALLOW_USER_CERTIFICATES, false);
public static final CachedFlag sAppSpecificHistoryViewIntent =
newCachedFlag(APP_SPECIFIC_HISTORY_VIEW_INTENT, true);
public static final CachedFlag sAsyncNotificationManager =
@@ -1156,6 +1159,7 @@ public abstract class ChromeFeatureList {
@@ -1217,6 +1220,7 @@ public abstract class ChromeFeatureList {
sAccountForSuppressedKeyboardInsets,
sAndroidAnimatedProgressBarInBrowser,
sAndroidApb144Patch1,
+ sAllowUserCertificates,
sAndroidAppIntegrationModule,
sAndroidAppIntegrationMultiDataSource,
sAndroidAutoMintedTwa,
sAndroidApb144Patch2,
sAndroidApb144Patch3,
sAndroidApb144Patch4,
diff --git a/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc b/cromite_flags/chrome/browser/about_flags_cc/Add-AllowUserCertificates-flag.inc
new file mode 100644
--- /dev/null
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
@@ -935,6 +935,12 @@ public class KeyboardShortcuts {
@@ -939,6 +939,12 @@ public class KeyboardShortcuts {
KeyEvent.KEYCODE_ESCAPE,
KeyEvent.META_CTRL_ON);
}
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
@@ -198,6 +198,10 @@ bool IsReducePPMsEnabled() {
@@ -199,6 +199,10 @@ bool IsReducePPMsEnabled() {
return g_is_reduce_ppms_enabled.load(std::memory_order_relaxed);
}

Expand All @@ -37,7 +37,7 @@ diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_p
#include "content/renderer/render_process_impl.h"

#include "build/build_config.h"
@@ -122,10 +123,18 @@ RenderProcessImpl::RenderProcessImpl()
@@ -123,10 +124,18 @@ RenderProcessImpl::RenderProcessImpl()
base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kDisallowV8FeatureFlagOverrides);
if (!disallow_v8_feature_flag_overrides) {
Expand Down
10 changes: 5 additions & 5 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
@@ -241,6 +241,8 @@ void SetRuntimeFeaturesFromChromiumFeatures() {
@@ -246,6 +246,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
@@ -63,4 +63,12 @@ bool IsGamepadMultitouchEnabled() {
@@ -59,4 +59,12 @@ bool IsGamepadMultitouchEnabled() {
return false;
}

Expand All @@ -56,10 +56,10 @@ diff --git a/device/gamepad/public/cpp/gamepad_features.cc b/device/gamepad/publ
diff --git a/device/gamepad/public/cpp/gamepad_features.h b/device/gamepad/public/cpp/gamepad_features.h
--- a/device/gamepad/public/cpp/gamepad_features.h
+++ b/device/gamepad/public/cpp/gamepad_features.h
@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kEnableGamepadMultitouch);
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
kEnableSimulatedGamepadDataFetcher);
@@ -17,6 +17,7 @@ GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kGamepadRawInputChangeEvent);
GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(
kClaimDuplicateGamepadsProductIdentifier);
+GAMEPAD_FEATURES_EXPORT BASE_DECLARE_FEATURE(kRestrictGamepadAccess);

#if BUILDFLAG(IS_WIN)
Expand Down
16 changes: 8 additions & 8 deletions build/patches/Add-a-proxy-configuration-page.patch
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -108,6 +108,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
@@ -110,6 +110,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
private static final String PREF_PASSWORD_LEAK_DETECTION = "password_leak_detection";
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
Expand All @@ -91,7 +91,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -424,6 +424,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
@@ -420,6 +420,7 @@ ChromeAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
builtins_to_provide.push_back(chrome::kChromeUISettingsURL16);
#endif
builtins_to_provide.push_back(chrome::kChromeUIVersionURL16);
Expand All @@ -102,7 +102,7 @@ diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -225,6 +225,9 @@
@@ -236,6 +236,9 @@
<if expr="_google_chrome">
<include name="IDR_PREF_HASH_SEED_BIN" file="resources\settings\internal\pref_hash_seed.bin" type="BINDATA" />
</if>
Expand Down Expand Up @@ -208,7 +208,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
@@ -1438,6 +1440,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1374,6 +1376,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
component_updater::RegisterPrefs(registry);
domain_reliability::RegisterPrefs(registry);
embedder_support::OriginTrialPrefs::RegisterPrefs(registry);
Expand Down Expand Up @@ -663,7 +663,7 @@ new file mode 100644
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -158,6 +158,8 @@ static_library("ui") {
@@ -156,6 +156,8 @@ static_library("ui") {
"webui/metrics_internals/metrics_internals_ui.h",
"webui/net_export_ui.cc",
"webui/net_export_ui.h",
Expand All @@ -685,7 +685,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_configs.cc b/chrome/browser/u
#if BUILDFLAG(ENABLE_WEBUI_CERTIFICATE_VIEWER)
#include "chrome/browser/ui/webui/certificate_viewer/certificate_viewer_ui.h"
#endif
@@ -449,7 +452,7 @@ void RegisterChromeWebUIConfigs() {
@@ -453,7 +456,7 @@ void RegisterChromeWebUIConfigs() {
map.AddWebUIConfig(std::make_unique<SigninErrorUIConfig>());
map.AddWebUIConfig(std::make_unique<SigninEmailConfirmationUIConfig>());
#endif // !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID)
Expand Down Expand Up @@ -1148,7 +1148,7 @@ diff --git a/chrome/common/webui_url_constants.cc b/chrome/common/webui_url_cons
diff --git a/chrome/common/webui_url_constants.h b/chrome/common/webui_url_constants.h
--- a/chrome/common/webui_url_constants.h
+++ b/chrome/common/webui_url_constants.h
@@ -206,6 +206,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
@@ -210,6 +210,8 @@ inline constexpr char kChromeUINetInternalsHost[] = "net-internals";
inline constexpr char kChromeUINetInternalsURL[] = "chrome://net-internals/";
inline constexpr char kChromeUINewTabHost[] = "newtab";
inline constexpr char kChromeUINewTabFooterHost[] = "newtab-footer";
Expand Down Expand Up @@ -1339,7 +1339,7 @@ diff --git a/net/features.gni b/net/features.gni
diff --git a/net/proxy_resolution/pac_file_fetcher_impl.cc b/net/proxy_resolution/pac_file_fetcher_impl.cc
--- a/net/proxy_resolution/pac_file_fetcher_impl.cc
+++ b/net/proxy_resolution/pac_file_fetcher_impl.cc
@@ -359,14 +359,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
@@ -364,14 +364,6 @@ bool PacFileFetcherImpl::ConsumeBytesRead(URLRequest* request, int num_bytes) {
return false;
}

Expand Down
Loading
Loading