diff --git a/build/patches/Do-not-compile-QR-code-sharing.patch b/build/patches/Do-not-compile-QR-code-sharing.patch index ba6539b65..61da4b60d 100644 --- a/build/patches/Do-not-compile-QR-code-sharing.patch +++ b/build/patches/Do-not-compile-QR-code-sharing.patch @@ -172,7 +172,7 @@ diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -1664,6 +1664,7 @@ void SendTabToSelf(Browser* browser) { +@@ -1667,6 +1667,7 @@ void SendTabToSelf(Browser* browser) { } bool CanGenerateQrCode(const Browser* browser) { diff --git a/build/patches/Enable-native-Android-autofill.patch b/build/patches/Enable-native-Android-autofill.patch index 612884173..9e53e4369 100644 --- a/build/patches/Enable-native-Android-autofill.patch +++ b/build/patches/Enable-native-Android-autofill.patch @@ -751,7 +751,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h --- a/components/autofill/content/browser/content_autofill_driver.h +++ b/components/autofill/content/browser/content_autofill_driver.h -@@ -135,6 +135,12 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -137,6 +137,12 @@ class ContentAutofillDriver : public AutofillDriver, // AutofillDriverFactory. Called on certain types of navigations. void Reset(ContentAutofillDriverFactoryPassKey pass_key); @@ -764,7 +764,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com content::RenderFrameHost* render_frame_host() { return &*render_frame_host_; } const content::RenderFrameHost* render_frame_host() const { return &*render_frame_host_; -@@ -292,6 +298,10 @@ class ContentAutofillDriver : public AutofillDriver, +@@ -294,6 +300,10 @@ class ContentAutofillDriver : public AutofillDriver, // The factory that created this driver. Outlives `this`. const raw_ref owner_; diff --git a/build/patches/Move-navigation-bar-to-bottom.patch b/build/patches/Move-navigation-bar-to-bottom.patch index 9e1daa170..ceac2942f 100644 --- a/build/patches/Move-navigation-bar-to-bottom.patch +++ b/build/patches/Move-navigation-bar-to-bottom.patch @@ -163,7 +163,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/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java --- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java +++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiCoordinator.java -@@ -39,6 +39,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; +@@ -40,6 +40,7 @@ import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.ui.modaldialog.ModalDialogManager; import org.chromium.ui.modelutil.PropertyModel; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; @@ -171,7 +171,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.util.List; -@@ -161,7 +162,8 @@ public class TabGroupUiCoordinator +@@ -169,7 +170,8 @@ public class TabGroupUiCoordinator public void initializeWithNative( Activity activity, BottomControlsCoordinator.BottomControlsVisibilityController visibilityController, @@ -181,7 +181,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser var currentTabModelFilterSupplier = mTabModelSelector.getTabModelFilterProvider().getCurrentTabModelFilterSupplier(); try (TraceEvent e = TraceEvent.scoped("TabGroupUiCoordinator.initializeWithNative")) { -@@ -220,7 +222,8 @@ public class TabGroupUiCoordinator +@@ -229,7 +231,8 @@ public class TabGroupUiCoordinator mLayoutStateProviderSupplier, mIncognitoStateProvider, mTabGridDialogControllerSupplier, @@ -432,8 +432,8 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser +import android.widget.FrameLayout; import android.widget.ImageView; - import androidx.annotation.IntDef; -@@ -57,6 +62,8 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor; + import androidx.annotation.DrawableRes; +@@ -58,6 +63,8 @@ import org.chromium.ui.modelutil.PropertyModelChangeProcessor; import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter; import org.chromium.ui.widget.ViewLookupCachingFrameLayout; @@ -442,7 +442,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.util.List; -@@ -114,6 +121,128 @@ public class TabListCoordinator +@@ -115,6 +122,128 @@ public class TabListCoordinator private int mAwaitingTabId = Tab.INVALID_TAB_ID; private @TabActionState int mTabActionState; @@ -571,7 +571,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser /** * Construct a coordinator for UI that shows a list of tabs. * -@@ -356,6 +485,12 @@ public class TabListCoordinator +@@ -311,6 +440,12 @@ public class TabListCoordinator checkAwaitingLayout(); } }; @@ -584,7 +584,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser mRecyclerView.setLayoutManager(gridLayoutManager); mMediator.registerOrientationListener(gridLayoutManager); mMediator.updateSpanCount( -@@ -367,8 +502,7 @@ public class TabListCoordinator +@@ -322,8 +457,7 @@ public class TabListCoordinator .getDecorView() .getWindowVisibleDisplayFrame(frame); updateGridCardLayout(frame.width()); @@ -594,7 +594,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser LinearLayoutManager layoutManager = new LinearLayoutManager( context, -@@ -383,6 +517,25 @@ public class TabListCoordinator +@@ -338,6 +472,25 @@ public class TabListCoordinator } }; mRecyclerView.setLayoutManager(layoutManager); @@ -620,16 +620,16 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser } mMediator.setRecyclerViewItemAnimationToggle(mRecyclerView::setDisableItemAnimations); } -@@ -400,7 +553,7 @@ public class TabListCoordinator - if (mHasEmptyView) { +@@ -358,7 +511,7 @@ public class TabListCoordinator + if (hasEmptyView) { mTabListEmptyCoordinator = new TabListEmptyCoordinator( - parentView, mModel, this::runOnItemAnimatorFinished); + parentView, mModel, this::runOnItemAnimatorFinished, mBrowserControlsStateProvider); - mEmptyStateHeadingResId = emptyHeadingStringResId; - mEmptyStateSubheadingResId = emptySubheadingStringResId; - mEmptyStateImageResId = emptyImageResId; -@@ -689,6 +842,9 @@ public class TabListCoordinator + } + + configureRecyclerViewTouchHelpers(mMode, mTabActionState); +@@ -644,6 +797,9 @@ public class TabListCoordinator void prepareTabSwitcherPaneView() { registerLayoutChangeListener(); mRecyclerView.setupCustomItemAnimator(); diff --git a/build/patches/Remove-binary-blob-integrations.patch b/build/patches/Remove-binary-blob-integrations.patch index 0a713af8a..caed6fd59 100644 --- a/build/patches/Remove-binary-blob-integrations.patch +++ b/build/patches/Remove-binary-blob-integrations.patch @@ -3697,7 +3697,7 @@ diff --git a/content/public/android/java/src/org/chromium/content/browser/webid/ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn -@@ -3581,10 +3581,6 @@ if (is_android) { +@@ -3582,10 +3582,6 @@ if (is_android) { testonly = true sources = content_java_sources_needing_jni deps = [ diff --git a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch index 0454ef333..27189dfda 100644 --- a/build/patches/ungoogled-chromium-no-special-hosts-domains.patch +++ b/build/patches/ungoogled-chromium-no-special-hosts-domains.patch @@ -946,7 +946,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -6533,7 +6533,6 @@ test("unit_tests") { +@@ -6534,7 +6534,6 @@ test("unit_tests") { "//chrome/browser/feedback:feedback_impl", "//chrome/browser/fingerprinting_protection", "//chrome/browser/first_party_sets",