diff --git a/browser/ui/toolbar/brave_bookmark_context_menu_controller.cc b/browser/ui/toolbar/brave_bookmark_context_menu_controller.cc index b0d4b6b332d..86368194295 100644 --- a/browser/ui/toolbar/brave_bookmark_context_menu_controller.cc +++ b/browser/ui/toolbar/brave_bookmark_context_menu_controller.cc @@ -35,13 +35,15 @@ BraveBookmarkContextMenuController::BraveBookmarkContextMenuController( Profile* profile, BookmarkLaunchLocation opened_from, const std::vector< - raw_ptr>& selection) + raw_ptr>& selection, + bool can_paste) : BookmarkContextMenuController(parent_window, delegate, browser, profile, opened_from, - selection), + selection, + can_paste), browser_(browser), prefs_(browser_ ? browser_->profile()->GetPrefs() : nullptr) { if (!browser_) { diff --git a/browser/ui/toolbar/brave_bookmark_context_menu_controller.h b/browser/ui/toolbar/brave_bookmark_context_menu_controller.h index a66eb1c9ec3..6cfa6ccd0bd 100644 --- a/browser/ui/toolbar/brave_bookmark_context_menu_controller.h +++ b/browser/ui/toolbar/brave_bookmark_context_menu_controller.h @@ -41,7 +41,8 @@ class BraveBookmarkContextMenuController Profile* profile, BookmarkLaunchLocation opened_from, const std::vector>& selection); + VectorExperimental>>& selection, + bool can_paste); BraveBookmarkContextMenuController( const BraveBookmarkContextMenuController&) = delete; diff --git a/browser/ui/toolbar/brave_bookmark_context_menu_controller_unittest.cc b/browser/ui/toolbar/brave_bookmark_context_menu_controller_unittest.cc index cdb0079da63..018e01dde1b 100644 --- a/browser/ui/toolbar/brave_bookmark_context_menu_controller_unittest.cc +++ b/browser/ui/toolbar/brave_bookmark_context_menu_controller_unittest.cc @@ -79,7 +79,7 @@ TEST_F(BraveBookmarkContextMenuControllerTest, BookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), BookmarkLaunchLocation::kSidePanelContextMenu, - {model_->bookmark_bar_node()}); + {model_->bookmark_bar_node()}, /*can_paste=*/false); // Show apps command is not present by default. sync_preferences::TestingPrefServiceSyncable* prefs = @@ -116,7 +116,8 @@ TEST_F(BraveBookmarkContextMenuControllerTest, TEST_F(BraveBookmarkContextMenuControllerTest, AddBraveBookmarksSubmenu) { BraveBookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), - BookmarkLaunchLocation::kSidePanelFolder, {model_->bookmark_bar_node()}); + BookmarkLaunchLocation::kSidePanelFolder, {model_->bookmark_bar_node()}, + /*can_paste=*/false); EXPECT_FALSE(controller.menu_model() ->GetIndexOfCommandId(IDC_BOOKMARK_BAR_ALWAYS_SHOW) .has_value()); @@ -191,7 +192,8 @@ TEST_F(BraveBookmarkContextMenuControllerTest, model_->bookmark_bar_node(), 0, u"t", GURL("https://example.com")); BraveBookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), - BookmarkLaunchLocation::kSidePanelFolder, {url_node}); + BookmarkLaunchLocation::kSidePanelFolder, {url_node}, + /*can_paste=*/false); EXPECT_FALSE( controller.menu_model()->GetIndexOfCommandId(IDC_OPEN_IN_CONTAINER)); @@ -215,7 +217,8 @@ TEST_F(BraveBookmarkContextMenuContainersTest, model_->bookmark_bar_node(), 0, u"t", GURL("https://example.com")); BraveBookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), - BookmarkLaunchLocation::kSidePanelFolder, {url_node}); + BookmarkLaunchLocation::kSidePanelFolder, {url_node}, + /*can_paste=*/false); ASSERT_TRUE( controller.menu_model()->GetIndexOfCommandId(IDC_OPEN_IN_CONTAINER)); @@ -238,7 +241,7 @@ TEST_F(BraveBookmarkContextMenuContainersTest, model_->AddFolder(model_->bookmark_bar_node(), 0, u"f"); BraveBookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), - BookmarkLaunchLocation::kSidePanelFolder, {folder}); + BookmarkLaunchLocation::kSidePanelFolder, {folder}, /*can_paste=*/false); EXPECT_FALSE( controller.menu_model()->GetIndexOfCommandId(IDC_OPEN_IN_CONTAINER)); @@ -253,7 +256,7 @@ TEST_F(BraveBookmarkContextMenuContainersTest, u"b", GURL("https://b.example/")); BraveBookmarkContextMenuController controller( gfx::NativeWindow(), nullptr, nullptr, profile_.get(), - BookmarkLaunchLocation::kSidePanelFolder, {a, b}); + BookmarkLaunchLocation::kSidePanelFolder, {a, b}, /*can_paste=*/false); EXPECT_FALSE( controller.menu_model()->GetIndexOfCommandId(IDC_OPEN_IN_CONTAINER)); diff --git a/browser/ui/views/bookmarks/brave_bookmark_context_menu.cc b/browser/ui/views/bookmarks/brave_bookmark_context_menu.cc index a1c0cacd17b..eeaa6c88630 100644 --- a/browser/ui/views/bookmarks/brave_bookmark_context_menu.cc +++ b/browser/ui/views/bookmarks/brave_bookmark_context_menu.cc @@ -27,13 +27,15 @@ BraveBookmarkContextMenu::BraveBookmarkContextMenu( BookmarkLaunchLocation opened_from, const std::vector< raw_ptr>& selection, - bool close_on_remove) + bool close_on_remove, + bool can_paste) : BookmarkContextMenu(parent_widget, browser, profile, opened_from, selection, - close_on_remove) { + close_on_remove, + can_paste) { auto* submenu = menu()->GetMenuItemByID(IDC_BRAVE_BOOKMARK_BAR_SUBMENU); DCHECK(submenu); auto* submenu_model = controller_->GetBookmarkSubmenuModel(); diff --git a/browser/ui/views/bookmarks/brave_bookmark_context_menu.h b/browser/ui/views/bookmarks/brave_bookmark_context_menu.h index 7958e97c2fc..6e13f34bf19 100644 --- a/browser/ui/views/bookmarks/brave_bookmark_context_menu.h +++ b/browser/ui/views/bookmarks/brave_bookmark_context_menu.h @@ -21,7 +21,8 @@ class BraveBookmarkContextMenu : public BookmarkContextMenu { BookmarkLaunchLocation opened_from, const std::vector>& selection, - bool close_on_remove); + bool close_on_remove, + bool can_paste); BraveBookmarkContextMenu(const BraveBookmarkContextMenu&) = delete; BraveBookmarkContextMenu& operator=(const BraveBookmarkContextMenu&) = delete; diff --git a/browser/ui/views/bookmarks/brave_bookmark_context_menu_unittest.cc b/browser/ui/views/bookmarks/brave_bookmark_context_menu_unittest.cc index 6165f5e0dc6..300354612e1 100644 --- a/browser/ui/views/bookmarks/brave_bookmark_context_menu_unittest.cc +++ b/browser/ui/views/bookmarks/brave_bookmark_context_menu_unittest.cc @@ -66,7 +66,7 @@ class BraveBookmarkContextMenuTest : public testing::Test { model_->bookmark_bar_node()}; auto menu = std::make_unique( nullptr, nullptr, profile_.get(), BookmarkLaunchLocation::kNone, nodes, - false); + false, /*can_paste=*/false); menu->GetControllerForTesting()->SetPrefsForTesting(prefs_.get()); return menu; }