Build fixes

   "java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",

   "java/src/org/chromium/chrome/browser/ActivityTabProvider.java",

   "java/src/org/chromium/chrome/browser/ActivityUtils.java",

@@ -915,6 +916,7 @@ chrome_java_sources = [

@@ -914,6 +915,7 @@ chrome_java_sources = [

   "java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",

   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",

   "java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",

+                Uri.parse(tab.getUrl().getSpec()));

+            intent.putExtra(Browser.EXTRA_APPLICATION_ID, context.getPackageName());

+            if (windowDisposition != WindowOpenDisposition.CURRENT_TAB) {

+                intent.putExtra(Browser.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);

+                intent.putExtra(IntentHandler.EXTRA_OPEN_NEW_INCOGNITO_TAB, true);

+            }

+            intent.setPackage(context.getPackageName());

+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java

@@ -37,6 +37,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;

@@ -36,6 +36,8 @@ import org.chromium.components.browser_ui.util.ConversionUtils;

 import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;

 import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;

 import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;

 import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;

 import org.chromium.components.favicon.LargeIconBridge;

 import org.chromium.url.GURL;

@@ -60,6 +62,8 @@ public class BookmarkManager

@@ -59,6 +61,8 @@ public class BookmarkManager

     private ComponentName mOpenBookmarkComponentName;

     private ViewGroup mMainView;

     private BookmarkModel mBookmarkModel;

     private BookmarkUndoController mUndoController;

     private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();

     private BasicNativePage mNativePage;

@@ -345,6 +349,14 @@ public class BookmarkManager

@@ -344,6 +348,14 @@ public class BookmarkManager

         mNativePage = nativePage;

     }

     /**

      * @return Current URL representing the UI state of bookmark manager. If no state has been shown

      *         yet in this session, on phone return last used state stored in preference; on tablet

@@ -541,6 +553,16 @@ public class BookmarkManager

@@ -540,6 +552,16 @@ public class BookmarkManager

         }

     }

diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc

--- a/chrome/browser/about_flags.cc

+++ b/chrome/browser/about_flags.cc

@@ -7463,6 +7463,10 @@ const FeatureEntry kFeatureEntries[] = {

@@ -7467,6 +7467,10 @@ const FeatureEntry kFeatureEntries[] = {

      FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)},

 #endif

diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc

--- a/chrome/browser/flag_descriptions.cc

+++ b/chrome/browser/flag_descriptions.cc

@@ -6458,6 +6458,9 @@ extern const char kLacrosScreenCoordinatesDescription[];

@@ -6463,6 +6463,9 @@ extern const char kLacrosScreenCoordinatesDescription[];

 #endif  // #if BUILDFLAG(IS_CHROMEOS_LACROS)

diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h

--- a/chrome/browser/flag_descriptions.h

+++ b/chrome/browser/flag_descriptions.h

@@ -3935,6 +3935,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];

@@ -3938,6 +3938,8 @@ extern const char kWebUITabStripTabDragIntegrationName[];

 extern const char kWebUITabStripTabDragIntegrationDescription[];

 #endif  // BUILDFLAG(ENABLE_WEBUI_TAB_STRIP) && BUILDFLAG(IS_CHROMEOS_ASH)

License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html

---

 chrome/android/java/res/menu/main_menu.xml    |  7 +++

 .../chrome/browser/ChromeTabbedActivity.java  | 26 ++++++++

 .../browser/bookmarks/BookmarkBridge.java     | 60 +++++++++++++++++++

 .../chrome/browser/ChromeTabbedActivity.java  | 24 ++++++++

 .../browser/bookmarks/BookmarkBridge.java     | 61 +++++++++++++++++++

 .../browser/bookmarks/BookmarkUtils.java      |  4 ++

 .../bookmarks/android/bookmark_bridge.cc      | 17 ++++++

 .../bookmarks/android/bookmark_bridge.h       |  4 ++

 components/bookmarks/browser/bookmark_node.h  |  5 ++

 components/bookmarks/browser/model_loader.cc  |  3 +-

 .../bookmark_specifics_conversions.cc         |  1 +

 21 files changed, 202 insertions(+), 10 deletions(-)

 21 files changed, 201 insertions(+), 10 deletions(-)

diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml

--- a/chrome/android/java/res/menu/main_menu.xml

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -77,6 +77,8 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan

@@ -77,6 +77,7 @@ import org.chromium.chrome.browser.back_press.MinimizeAppAndCloseTabBackPressHan

 import org.chromium.chrome.browser.bookmarks.BookmarkUtils;

 import org.chromium.chrome.browser.browserservices.intents.WebappConstants;

 import org.chromium.chrome.browser.compositor.CompositorViewHolder;

+import org.chromium.chrome.browser.bookmarks.BookmarkBridge;

+import org.chromium.chrome.browser.bookmarks.BookmarkModel;

 import org.chromium.chrome.browser.compositor.layouts.Layout;

 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;

 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChromePhone;

@@ -2203,6 +2205,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent

@@ -2203,6 +2204,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent

             CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),

                     () -> getTabModelSelector().closeAllTabs(), /*isIncognito=*/false);

             RecordUserAction.record("MobileMenuCloseAllTabs");

         } else if (id == R.id.close_all_incognito_tabs_menu_id) {

             // Close only incognito tabs

             CloseAllTabsDialog.show(this, getModalDialogManagerSupplier(),

@@ -2255,6 +2259,28 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent

@@ -2255,6 +2258,27 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent

         mTabModalHandler.onOmniboxFocusChanged(hasFocus);

     }

+            return;

+        }

+

+        final BookmarkBridge bridge = mBookmarkBridgeSupplier.get();

+        final BookmarkModel bookmarkModel = new BookmarkModel();

+        final BookmarkModel bookmarkModel = mBookmarkModelSupplier.get();

+        bookmarkModel.finishLoadingBookmarkModel(() -> {

+            for (int i = 0; i < tabModel.getCount(); i++) {

+                Tab tab = tabModel.getTabAt(i);

+                if (tab.isNativePage()) {

+                    continue;

+                }

+                bridge.addToTabsCollection(this, tab);

+                bookmarkModel.addToTabsCollection(this, tab);

+            }

+            bridge.finishedAddingToTabsCollection(this, getSnackbarManager());

+            bookmarkModel.finishedAddingToTabsCollection(this, getSnackbarManager());

+        });

+    }

+

 import org.chromium.components.bookmarks.BookmarkId;

 import org.chromium.components.bookmarks.BookmarkItem;

 import org.chromium.components.bookmarks.BookmarkType;

@@ -87,6 +92,7 @@ import java.io.File;

@@ -86,6 +91,8 @@ import java.io.File;

  * bookmark model stored in native.

  */

 class BookmarkBridge {

     private final Profile mProfile;

+    private static final String TAG = "BookmarkBridge";

+

     private final Profile mProfile;

     private boolean mIsDestroyed;

     private boolean mIsDoingExtensiveChanges;

     private long mNativeBookmarkBridge;

@@ -393,6 +399,16 @@ class BookmarkBridge {

@@ -393,6 +400,16 @@ class BookmarkBridge {

                 mNativeBookmarkBridge, BookmarkBridge.this);

     }

     /**

      * @return Id representing the special "other" folder from bookmark model.

      */

@@ -1030,6 +1046,49 @@ class BookmarkBridge {

@@ -1030,6 +1047,49 @@ class BookmarkBridge {

                 mNativeBookmarkBridge, BookmarkBridge.this, title, url);

     }

     /**

      * @param url The URL of the reading list item.

      * @return The reading list item with the URL, or null if no such reading list item.

@@ -1327,6 +1386,7 @@ class BookmarkBridge {

@@ -1327,6 +1387,7 @@ class BookmarkBridge {

         void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,

                 List<BookmarkId> folderList, List<Integer> depthList);

         BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);

diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni

--- a/chrome/android/chrome_java_sources.gni

+++ b/chrome/android/chrome_java_sources.gni

@@ -908,6 +908,8 @@ chrome_java_sources = [

@@ -907,6 +907,8 @@ chrome_java_sources = [

   "java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",

   "java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",

   "java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",