Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit c5a85ab0 authored by uazo's avatar uazo Committed by GitHub
Browse files

[AUTO] Patches auto-rebase for next-134 branch (#1876) 

[AUTO] Patches auto-rebase for next-134 branch
parents 6c7b6ba5 e30a8991

build/patches/Add-an-always-incognito-mode.patch

+7 −7
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 
             // Defer creation of this helper so it triggers after TabGroupModelFilter observers.

             mUndoRefocusHelper =

                     new UndoRefocusHelper(

@@ -2572,8 +2581,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn

@@ -2571,8 +2580,9 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn

 

         // We determine the model as soon as possible so every systems get initialized coherently.

         boolean startIncognito =
@@ -392,7 +392,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr 
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;

 import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;

 import org.chromium.chrome.browser.download.DownloadUtils;

@@ -329,6 +330,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@@ -339,6 +340,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

     public List<Pair<Integer, ModelList>> buildContextMenu() {

         mShowEphemeralTabNewLabel = null;
@@ -402,7 +402,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr 
         List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();

 

         if (mParams.isAnchor()) {

@@ -339,6 +343,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@@ -349,6 +353,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

                 if (mMode == ContextMenuMode.NORMAL) {

                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));

                     linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB));
@@ -410,7 +410,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr 
                     if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {

                         linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));

                     }

@@ -369,7 +374,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

@@ -379,7 +384,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {

                 }

             }

             if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -1043,7 +1043,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore 
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

@@ -181,6 +181,8 @@ import org.chromium.ui.InsetObserver;

@@ -180,6 +180,8 @@ import org.chromium.ui.InsetObserver;

 import org.chromium.ui.UiUtils;

 import org.chromium.ui.base.ActivityWindowAndroid;

 import org.chromium.ui.base.DeviceFormFactor;
@@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab 
 import org.chromium.ui.base.IntentRequestTracker;

 import org.chromium.ui.base.LocalizationUtils;

 import org.chromium.ui.dragdrop.DragDropGlobalState;

@@ -1084,7 +1086,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {

@@ -1078,7 +1080,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {

                             () -> {

                                 mTabCreatorManagerSupplier

                                         .get()
@@ -1140,7 +1140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar 
 import org.chromium.chrome.browser.IntentHandler;

 import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;

 import org.chromium.chrome.browser.back_press.BackPressManager;

@@ -756,7 +757,7 @@ public class ToolbarManager

@@ -752,7 +753,7 @@ public class ToolbarManager

                                 TraceEvent.end("isOfflinePage");

                                 return ret;

                             }

build/patches/Add-bookmark-import-export-actions.patch

+2 −2
Original line number Diff line number Diff line
@@ -816,7 +816,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 
     "bookmarks/chrome_bookmark_client.cc",

     "bookmarks/chrome_bookmark_client.h",

     "bookmarks/managed_bookmark_service_factory.cc",

@@ -1692,6 +1694,13 @@ static_library("browser") {

@@ -1698,6 +1700,13 @@ static_library("browser") {

     ]

   }
@@ -830,7 +830,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn 
   configs += [

     "//build/config/compiler:wexit_time_destructors",

     "//build/config:precompiled_headers",

@@ -3501,8 +3510,6 @@ static_library("browser") {

@@ -3507,8 +3516,6 @@ static_library("browser") {

       "bookmarks/bookmark_expanded_state_tracker.h",

       "bookmarks/bookmark_expanded_state_tracker_factory.cc",

       "bookmarks/bookmark_expanded_state_tracker_factory.h",

build/patches/Add-cromite-flags-support.patch

+1 −1
Original line number Diff line number Diff line
@@ -966,7 +966,7 @@ diff --git a/chrome/browser/ui/ui_features.cc b/chrome/browser/ui/ui_features.cc 
diff --git a/chrome/common/chrome_features.cc b/chrome/common/chrome_features.cc

--- a/chrome/common/chrome_features.cc

+++ b/chrome/common/chrome_features.cc

@@ -1561,4 +1561,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,

@@ -1569,4 +1569,5 @@ BASE_FEATURE(kDisableShortcutsEnableDiy,

              "DisableShortcutsEnableDiy",

              base::FEATURE_ENABLED_BY_DEFAULT);

build/patches/Add-exit-menu-item.patch

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct 
 /**

  * This is the main activity for ChromeMobile when not running in document mode. All the tabs are

  * accessible via a chrome specific tab switching UI.

@@ -3022,6 +3024,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn

@@ -3021,6 +3023,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements MismatchedIn

                     .closeTabs(

                             TabClosureParams.closeTab(currentTab).build(), /* allowDialog= */ true);

             RecordUserAction.record("MobileTabClosed");

build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/ 
diff --git a/components/omnibox/browser/history_url_provider.cc b/components/omnibox/browser/history_url_provider.cc

--- a/components/omnibox/browser/history_url_provider.cc

+++ b/components/omnibox/browser/history_url_provider.cc

@@ -490,6 +490,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,

@@ -489,6 +489,9 @@ void HistoryURLProvider::Start(const AutocompleteInput& input,

   if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)

     matches_.push_back(what_you_typed_match);