diff --git a/build/patches/Disable-Real-Box.patch b/build/patches/Disable-Real-Box.patch index a472a91a..09b3298a 100644 --- a/build/patches/Disable-Real-Box.patch +++ b/build/patches/Disable-Real-Box.patch @@ -5,15 +5,15 @@ Subject: Disable Real Box Real-box is search box in ntp --- chrome/browser/prefs/browser_prefs.cc | 2 +- - .../browser/resources/new_tab_page/app.html | 21 ------------------- + .../browser/resources/new_tab_page/app.html | 19 ------------------- .../searchbox/searchbox_handler.cc | 1 + components/search/ntp_features.cc | 4 ++-- - 4 files changed, 4 insertions(+), 24 deletions(-) + 4 files changed, 4 insertions(+), 22 deletions(-) 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 -@@ -2026,7 +2026,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2031,7 +2031,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, registry->RegisterBooleanPref( prefs::kLensRegionSearchEnabled, true, user_prefs::PrefRegistrySyncable::SYNCABLE_PREF); @@ -25,7 +25,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/resources/new_tab_page/app.html --- a/chrome/browser/resources/new_tab_page/app.html +++ b/chrome/browser/resources/new_tab_page/app.html -@@ -40,27 +40,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js'; +@@ -41,25 +41,6 @@ import {nothing} from '//resources/lit/v3_0/lit.rollup.js'; ?hidden="${!this.showScrim_}"> ` : ''}
@@ -44,8 +44,6 @@ diff --git a/chrome/browser/resources/new_tab_page/app.html b/chrome/browser/res - searchbox-layout-mode="${this.realboxLayoutMode_}" - ?ntp-realbox-next-enabled="${this.ntpRealboxNextEnabled_}" - ?cycling-placeholders="${this.searchboxCyclingPlaceholders_}" -- ?show-canvas="${this.showCanvas_}" -- ?show-model-picker="${this.showModelPicker_}" - @searchbox-input-focus-changed="${this.onInputFocusChanged_}" - context-menu-glif-animation-state="${this.contextMenuGlifAnimationState_}" - ?multi-line-enabled="${this.multiLineEnabled_}"> diff --git a/build/patches/Guard-for-user-agent-reduction.patch b/build/patches/Guard-for-user-agent-reduction.patch index d3fc6f46..98ba63ca 100644 --- a/build/patches/Guard-for-user-agent-reduction.patch +++ b/build/patches/Guard-for-user-agent-reduction.patch @@ -11,15 +11,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -854,6 +854,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { +@@ -855,6 +855,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) { } std::string BuildModelInfo() { + if ((true)) return std::string(); #if BUILDFLAG(IS_ANDROID) // Model information is not exposed on Android desktop. - if (ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_DESKTOP) { -@@ -896,6 +897,10 @@ std::string GetAndroidOSInfo( + if (base::android::device_info::is_desktop()) { +@@ -897,6 +898,10 @@ std::string GetAndroidOSInfo( IncludeAndroidModel include_android_model) { std::string android_info_str; @@ -33,7 +33,7 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedd diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -4244,22 +4244,22 @@ +@@ -4240,22 +4240,22 @@ // If enabled, the deviceModel will be reduced to "K" and the // androidVersion will be reduced to a static "10" string in android // User-Agent string. diff --git a/build/patches/Modify-default-preferences.patch b/build/patches/Modify-default-preferences.patch index ff27d578..02a2433d 100644 --- a/build/patches/Modify-default-preferences.patch +++ b/build/patches/Modify-default-preferences.patch @@ -320,10 +320,10 @@ diff --git a/components/security_interstitials/core/features.cc b/components/sec diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc --- a/components/signin/internal/identity_manager/primary_account_manager.cc +++ b/components/signin/internal/identity_manager/primary_account_manager.cc -@@ -320,7 +320,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { - prefs::kGoogleServicesSyncingGaiaIdMigratedToSignedIn, std::string()); - registry->RegisterStringPref( +@@ -322,7 +322,7 @@ void PrimaryAccountManager::RegisterProfilePrefs(PrefRegistrySimple* registry) { prefs::kGoogleServicesSyncingUsernameMigratedToSignedIn, std::string()); + registry->RegisterIntegerPref(prefs::kGoogleServicesSyncingUserMigrationType, + /*SyncToSigninMigrationType::kUnknown=*/0); - registry->RegisterBooleanPref(prefs::kSigninAllowed, true); + registry->RegisterBooleanPref(prefs::kSigninAllowed, false); registry->RegisterBooleanPref(prefs::kSignedInWithCredentialProvider, false); diff --git a/build/patches/Remove-voice-recognition-integration.patch b/build/patches/Remove-voice-recognition-integration.patch index 25980c81..bfc2bcb1 100644 --- a/build/patches/Remove-voice-recognition-integration.patch +++ b/build/patches/Remove-voice-recognition-integration.patch @@ -650,10 +650,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.OmniboxMetrics; import org.chromium.chrome.browser.omnibox.fusebox.ComposeBoxQueryControllerBridge; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult; + import org.chromium.chrome.browser.preloading.PreloadingFeatureMap; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.components.omnibox.AutocompleteInput; - import org.chromium.components.omnibox.AutocompleteMatch; -@@ -341,25 +340,6 @@ public class AutocompleteController { +@@ -355,25 +354,6 @@ public class AutocompleteController { mNativeController, bridge == null ? 0L : bridge.getNativeInstance()); } @@ -679,7 +679,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow /** * Updates searchbox stats parameters on the selected match that we will navigate to and * returns the updated URL. -@@ -469,11 +449,6 @@ public class AutocompleteController { +@@ -483,11 +463,6 @@ public class AutocompleteController { long nativeAutocompleteControllerAndroid, long nativeComposeboxQueryControllerBridge); @@ -724,10 +724,10 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow import org.chromium.chrome.browser.omnibox.suggestions.action.OmniboxActionInSuggest; import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState; -import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler; + import org.chromium.chrome.browser.preloading.PreloadingFeatureMap; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; - import org.chromium.chrome.browser.tab.Tab; -@@ -540,15 +539,6 @@ class AutocompleteMediator +@@ -541,15 +540,6 @@ class AutocompleteMediator mShouldPreventOmniboxAutocomplete = prevent; }