PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

AUTOMATED - git apply results

Browse Source
This commit is contained in:
uazo
2023-03-01 16:37:19 +00:00
committed by GitHub
parent e8a7d1fafb
commit 11f1fa3e81
26 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00109-ADDNEW-Move-navigation-bar-to-bottom.patch
+2 -2
View File
@@ -710,7 +710,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
@@ -239,7 +239,7 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
@@ -244,7 +244,7 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
// to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and
// receive a second request to hide the keyboard instantly.
if (showKeyboard) {
@@ -850,7 +850,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -110,7 +110,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -113,7 +113,7 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@Override
public void initWithToolbar(int toolbarLayoutId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
build/patches/00109-ADDTO-Disable-safe-browsing.patch
+4 -4
View File
@@ -11,7 +11,7 @@ Subject: 109 ADDTO Disable safe browsing
diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
+++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
@@ -115,6 +115,7 @@ const char kPathKey[] = "path";
@@ -117,6 +117,7 @@ const char kPathKey[] = "path";
const char kPathTypeKey[] = "path-type";
const char kTimestampKey[] = "timestamp";
@@ -19,7 +19,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin,
@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
@@ -146,7 +147,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread(
origin, handle_type, std::move(callback), web_contents);
}
@@ -27,7 +27,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
void ShowFileSystemAccessDangerousFileDialogOnUIThread(
content::GlobalRenderFrameHostId frame_id,
const url::Origin& origin,
@@ -437,6 +437,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
@@ -488,6 +488,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) {
: kPermissionReadableKey;
}
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permiss
bool FileHasDangerousExtension(const url::Origin& origin,
const base::FilePath& path,
Profile* profile) {
@@ -448,6 +449,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
@@ -499,6 +500,7 @@ bool FileHasDangerousExtension(const url::Origin& origin,
return danger_level == safe_browsing::DownloadFileType::DANGEROUS ||
danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE;
}
build/patches/00110-ADDTO-Add-custom-tab-intents-privacy-option.patch
+2 -2
View File
@@ -10,7 +10,7 @@ Subject: 110 ADDTO Add custom tab intents privacy option
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
@@ -575,8 +575,8 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
@@ -576,8 +576,8 @@ BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
BASE_FEATURE(kCCTIntentFeatureOverrides,
@@ -21,7 +21,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kCCTPackageNameRecording,
"CCTPackageNameRecording",
@@ -584,7 +584,7 @@ BASE_FEATURE(kCCTPackageNameRecording,
@@ -585,7 +585,7 @@ BASE_FEATURE(kCCTPackageNameRecording,
BASE_FEATURE(kCCTPostMessageAPI,
"CCTPostMessageAPI",
build/patches/00AdblockPlus.patch
+1 -1
View File
@@ -162767,7 +162767,7 @@ diff --git a/tools/metrics/histograms/enums.xml b/tools/metrics/histograms/enums
</enum>
<enum name="ExtensionPointEnableState">
@@ -100570,6 +100604,8 @@ Full version information for the fingerprint enum values:
@@ -100588,6 +100622,8 @@ Full version information for the fingerprint enum values:
<int value="29" label="kMediaStorageIdSalt"/>
<int value="30" label="kModuleBlocklistCacheMD5Digest"/>
<int value="32" label="kMediaCdmOriginData"/>
build/patches/00WIN-ADDTO-Remove-signin-and-sync-integrations.patch
+2 -2
View File
@@ -195,7 +195,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -383,7 +383,6 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
@@ -370,7 +370,6 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
IncompatibleApplicationsUpdater::HasCachedApplications();
}
#endif
@@ -203,7 +203,7 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/
#endif
// Presentation of promotional and/or educational tabs may be controlled via
@@ -411,8 +410,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
@@ -398,8 +397,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile_))
welcome_enabled = false;
#elif !BUILDFLAG(IS_CHROMEOS_ASH)
build/patches/Add-AllowUserCertificates-flag.patch
+2 -2
View File
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&feed::kInterestFeedV1ClicksAndViewsConditionalUpload,
&feed::kInterestFeedV2,
&feed::kInterestFeedV2Autoplay,
@@ -462,6 +463,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
@@ -463,6 +464,10 @@ BASE_FEATURE(kAllowNewIncognitoTabIntents,
"AllowNewIncognitoTabIntents",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -133,7 +133,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR = "AdaptiveButtonInTopToolbar";
public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_CUSTOMIZATION_V2 =
"AdaptiveButtonInTopToolbarCustomizationV2";
@@ -607,6 +608,8 @@ public abstract class ChromeFeatureList {
@@ -608,6 +609,8 @@ public abstract class ChromeFeatureList {
"SkipServiceWorkerForInstallPromot";
/* Alphabetical: */
build/patches/Add-an-always-incognito-mode.patch
+1 -1
View File
@@ -1295,7 +1295,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
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
@@ -553,8 +553,8 @@ BASE_FEATURE(kCCTFeatureUsage,
@@ -554,8 +554,8 @@ BASE_FEATURE(kCCTFeatureUsage,
BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
build/patches/Add-bookmark-import-export-actions.patch
+3 -3
View File
@@ -1287,7 +1287,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kCriticalPersistedTabData,
&kCommerceCoupons,
&kCCTBackgroundTab,
@@ -1097,6 +1098,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
@@ -1102,6 +1103,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
"WebApkTrampolineOnInitialIntent",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1302,7 +1302,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -159,6 +159,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
@@ -160,6 +160,7 @@ BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
BASE_DECLARE_FEATURE(kTabStripRedesign);
BASE_DECLARE_FEATURE(kTabSwitcherOnReturn);
BASE_DECLARE_FEATURE(kTabToGTSAnimation);
@@ -1313,7 +1313,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
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
@@ -576,6 +576,7 @@ public abstract class ChromeFeatureList {
@@ -577,6 +577,7 @@ public abstract class ChromeFeatureList {
public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
"UseLibunwindstackNativeUnwinderAndroid";
public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
build/patches/Add-lifetime-options-for-permissions.patch
+6 -6
View File
@@ -1267,7 +1267,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
request->RequestFinished();
return;
@@ -532,14 +532,15 @@ void PermissionRequestManager::Accept() {
@@ -538,14 +538,15 @@ void PermissionRequestManager::Accept() {
(*requests_iter)->request_type(),
PermissionAction::GRANTED);
PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1285,7 +1285,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_)
return;
DCHECK(view_);
@@ -550,7 +551,8 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -556,7 +557,8 @@ void PermissionRequestManager::AcceptThisTime() {
(*requests_iter)->request_type(),
PermissionAction::GRANTED_ONCE);
PermissionGrantedIncludingDuplicates(*requests_iter,
@@ -1295,7 +1295,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(PermissionAction::GRANTED_ONCE);
@@ -558,6 +560,15 @@ void PermissionRequestManager::AcceptThisTime() {
@@ -564,6 +566,15 @@ void PermissionRequestManager::AcceptThisTime() {
}
void PermissionRequestManager::Deny() {
@@ -1311,7 +1311,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
if (ignore_callbacks_from_prompt_)
return;
DCHECK(view_);
@@ -580,7 +591,7 @@ void PermissionRequestManager::Deny() {
@@ -586,7 +597,7 @@ void PermissionRequestManager::Deny() {
StorePermissionActionForUMA((*requests_iter)->requesting_origin(),
(*requests_iter)->request_type(),
PermissionAction::DENIED);
@@ -1320,7 +1320,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
NotifyRequestDecided(PermissionAction::DENIED);
@@ -996,25 +1007,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
@@ -1003,25 +1014,25 @@ PermissionRequest* PermissionRequestManager::GetExistingRequest(
void PermissionRequestManager::PermissionGrantedIncludingDuplicates(
PermissionRequest* request,
@@ -1352,7 +1352,7 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/p
}
void PermissionRequestManager::CancelledIncludingDuplicates(
@@ -1241,7 +1252,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
@@ -1248,7 +1259,7 @@ void PermissionRequestManager::LogWarningToConsole(const char* message) {
void PermissionRequestManager::DoAutoResponseForTesting() {
switch (auto_response_for_test_) {
case ACCEPT_ONCE:
build/patches/Add-option-to-force-tablet-UI.patch
+2 -2
View File
@@ -72,7 +72,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -376,7 +376,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -381,7 +381,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
// OmniboxSuggestionsDropdownEmbedder implementation
@Override
public boolean isTablet() {
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -139,22 +139,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -142,22 +142,6 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
mToolbarContainer.setPostInitializationDependencies(mToolbar, constraintsSupplier,
tabSupplier, compositorInMotionSupplier,
browserStateBrowserControlsVisibilityDelegate, isVisible);
build/patches/Bromite-auto-updater.patch
+1 -1
View File
@@ -1257,7 +1257,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kBookmarksImprovedSaveFlow,
&kBookmarksRefresh,
&kBackGestureRefactorAndroid,
@@ -693,6 +694,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens,
@@ -694,6 +695,10 @@ BASE_FEATURE(kContextMenuTranslateWithGoogleLens,
"ContextMenuTranslateWithGoogleLens",
base::FEATURE_DISABLED_BY_DEFAULT);
build/patches/Disable-AGSA-by-default.patch
+1 -1
View File
@@ -261,7 +261,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/share/LensUtils
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
@@ -737,8 +737,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
@@ -738,8 +738,8 @@ BASE_FEATURE(kDuetTabStripIntegrationAndroid,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kExperimentsForAgsa,
build/patches/Disable-StartSurface-feature.patch
+1 -1
View File
@@ -12,7 +12,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -1060,8 +1060,8 @@ BASE_FEATURE(kTrustedWebActivityQualityEnforcementWarning,
@@ -1065,8 +1065,8 @@ BASE_FEATURE(kTrustedWebActivityQualityEnforcementWarning,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kStartSurfaceAndroid,
build/patches/Disable-conversion-measurement-api.patch
+1 -1
View File
@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -509,8 +509,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,
@@ -510,8 +510,8 @@ BASE_FEATURE(kAppMenuMobileSiteOption,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kAppToWebAttribution,
build/patches/Disable-safe-browsing.patch
+1 -1
View File
@@ -2774,7 +2774,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -698,10 +698,7 @@ PermissionRequestManager::PermissionRequestManager(
@@ -704,10 +704,7 @@ PermissionRequestManager::PermissionRequestManager(
view_factory_(base::BindRepeating(&PermissionPrompt::Create)),
tab_is_hidden_(web_contents->GetVisibility() ==
content::Visibility::HIDDEN),
build/patches/Disable-smart-selection-by-default.patch
+1 -1
View File
@@ -50,7 +50,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kCCTIncognitoAvailableToThirdParty,
&kCCTIntentFeatureOverrides,
&kCCTNewDownloadTab,
@@ -979,6 +980,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
@@ -984,6 +985,10 @@ BASE_FEATURE(kDiscoverFeedMultiColumn,
"DiscoverFeedMultiColumn",
base::FEATURE_DISABLED_BY_DEFAULT);
build/patches/Enable-share-intent.patch
+4 -4
View File
@@ -353,7 +353,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
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
@@ -274,6 +274,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -275,6 +275,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kSearchReadyOmniboxFeature,
&kRelatedSearches,
&kRelatedSearchesInBar,
@@ -361,7 +361,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kRelatedSearchesUi,
&kReportParentalControlSitesChild,
&kRequestDesktopSiteDefaults,
@@ -923,6 +924,10 @@ BASE_FEATURE(kSafeModeForCachedFlags,
@@ -928,6 +929,10 @@ BASE_FEATURE(kSafeModeForCachedFlags,
"SafeModeForCachedFlags",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -375,7 +375,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -140,6 +140,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2);
@@ -141,6 +141,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2);
BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice);
BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2);
BASE_DECLARE_FEATURE(kSearchReadyOmniboxFeature);
@@ -392,8 +392,8 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String READ_LATER = "ReadLater";
+ public static final String SHARED_INTENT_UI = "SharedIntentUI";
public static final String READER_MODE_IN_CCT = "ReaderModeInCCT";
public static final String RECORD_SUPPRESSION_METRICS = "RecordSuppressionMetrics";
public static final String RECOVER_FROM_NEVER_SAVE_ANDROID = "RecoverFromNeverSaveAndroid";
public static final String REENGAGEMENT_NOTIFICATION = "ReengagementNotification";
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
build/patches/Move-navigation-bar-to-bottom.patch
+6 -6
View File
@@ -1744,7 +1744,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
public static final String NEW_TAB_PAGE_TILES_TITLE_WRAP_AROUND =
"NewTabPageTilesTitleWrapAround";
@@ -675,6 +677,8 @@ public abstract class ChromeFeatureList {
@@ -676,6 +678,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
public static final CachedFlag sLensCameraAssistedSearch =
new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true);
@@ -1877,7 +1877,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
Context context = mLocationBarLayout.getContext();
mUrlBar = mLocationBarLayout.findViewById(R.id.url_bar);
@@ -389,6 +391,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -394,6 +396,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
return mAutocompleteAnchorView;
}
@@ -1902,7 +1902,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/**
* Coordinates the interactions with the UrlBar text component.
*/
@@ -236,7 +239,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
@@ -241,7 +244,13 @@ public class UrlBarCoordinator implements UrlBarEditingTextStateProvider, UrlFoc
// to show or hide keyboard anyway. This may happen when we schedule keyboard hide, and
// receive a second request to hide the keyboard instantly.
if (showKeyboard) {
@@ -2318,8 +2318,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -49,6 +49,11 @@ import org.chromium.ui.widget.OptimizedFrameLayout;
@@ -52,6 +52,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.function.BooleanSupplier;
+import android.view.Gravity;
@@ -2330,7 +2330,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
/**
* Layout for the browser controls (omnibox, menu, tab strip, etc..).
*/
@@ -105,6 +110,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -108,6 +113,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@Override
public void initWithToolbar(int toolbarLayoutId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
build/patches/Re-introduce-modal-dialog-flag-to-close-all-tabs.patch
+2 -2
View File
@@ -185,7 +185,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kAppToWebAttribution,
&kBackgroundThreadPool,
&kCastDeviceFilter,
@@ -513,6 +514,10 @@ BASE_FEATURE(kConditionalTabStripAndroid,
@@ -514,6 +515,10 @@ BASE_FEATURE(kConditionalTabStripAndroid,
"ConditionalTabStripAndroid",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -196,7 +196,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
// Used in downstream code.
BASE_FEATURE(kCastDeviceFilter,
"CastDeviceFilter",
@@ -523,8 +528,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation,
@@ -524,8 +529,8 @@ BASE_FEATURE(kClearOmniboxFocusAfterNavigation,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kCloseTabSuggestions,
build/patches/Remove-contextual-search-manager.patch
+2 -2
View File
@@ -1189,7 +1189,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kDeferKeepScreenOnDuringGesture,
&kDirectActions,
&kDuetTabStripIntegrationAndroid,
@@ -706,26 +699,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
@@ -707,26 +700,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
"LensOnQuickActionSearchWidget",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1216,7 +1216,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kDeferKeepScreenOnDuringGesture,
"DeferKeepScreenOnDuringGesture",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -739,7 +712,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -740,7 +713,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
build/patches/Remove-voice-recognition-integration.patch
+1 -1
View File
@@ -622,7 +622,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Nullable
@Override
public OmniboxStub getOmniboxStub() {
@@ -654,11 +646,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -659,11 +651,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
// End tablet-specific methods.
build/patches/Restore-Search-Ready-Omnibox-flag.patch
+4 -4
View File
@@ -78,15 +78,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
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
@@ -266,6 +266,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kReachedCodeProfiler,
@@ -267,6 +267,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kReaderModeInCCT,
&kRecordSuppressionMetrics,
&kReengagementNotification,
+ &kSearchReadyOmniboxFeature,
&kRelatedSearches,
&kRelatedSearchesInBar,
&kRelatedSearchesUi,
@@ -821,6 +822,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents,
@@ -822,6 +823,10 @@ BASE_FEATURE(kOpaqueOriginForIncomingIntents,
"OpaqueOriginForIncomingIntents",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -100,7 +100,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -134,6 +134,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDevice);
@@ -135,6 +135,7 @@ BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDevice);
BASE_DECLARE_FEATURE(kSearchEnginePromoExistingDeviceV2);
BASE_DECLARE_FEATURE(kSearchEnginePromoNewDevice);
BASE_DECLARE_FEATURE(kSearchEnginePromoNewDeviceV2);
build/patches/Restore-Simplified-NTP-launch.patch
+1 -1
View File
@@ -365,7 +365,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kInstanceSwitcher,
&kInstantStart,
&kIsVoiceSearchEnabledCache,
@@ -800,6 +801,10 @@ BASE_FEATURE(kInstanceSwitcher,
@@ -801,6 +802,10 @@ BASE_FEATURE(kInstanceSwitcher,
"InstanceSwitcher",
base::FEATURE_ENABLED_BY_DEFAULT);
build/patches/Restore-offline-indicator-v2-flag.patch
+1 -1
View File
@@ -191,7 +191,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
&kPageAnnotationsService,
&kInlineUpdateFlow,
&kBookmarksImprovedSaveFlow,
@@ -732,6 +733,10 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -733,6 +734,10 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
build/patches/Unexpire-tab-groups-flags.patch
+1 -1
View File
@@ -34,7 +34,7 @@ diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.js
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
@@ -960,16 +960,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid,
@@ -965,16 +965,16 @@ BASE_FEATURE(kTabEngagementReportingAndroid,
base::FEATURE_DISABLED_BY_DEFAULT);
BASE_FEATURE(kTabGroupsAndroid,
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+1 -1
View File
@@ -581,7 +581,7 @@ diff --git a/components/google/core/common/google_util.h b/components/google/cor
diff --git a/components/page_load_metrics/browser/page_load_metrics_util.cc b/components/page_load_metrics/browser/page_load_metrics_util.cc
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
@@ -280,9 +280,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
@@ -282,9 +282,7 @@ bool DidObserveLoadingBehaviorInAnyFrame(
}
bool IsGoogleSearchHostname(const GURL& url) {