diff options
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc index 1ac0287..f13bfbb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_controller_views.cc @@ -141,29 +141,13 @@ void BookmarkContextMenuControllerViews::ExecuteCommand(int id) { case IDC_BOOKMARK_MANAGER: { content::RecordAction(UserMetricsAction("ShowBookmarkManager")); if (selection_.size() != 1) -<<<<<<< .mine chrome::ShowBookmarkManager(browser); -======= - browser_->OpenBookmarkManager(); ->>>>>>> .r143383 else if (selection_[0]->is_folder()) -<<<<<<< .mine chrome::ShowBookmarkManagerForNode(browser, selection_[0]->id()); -======= - browser_->OpenBookmarkManagerForNode(selection_[0]->id()); ->>>>>>> .r143383 else if (parent_) -<<<<<<< .mine chrome::ShowBookmarkManagerForNode(browser, parent_->id()); -======= - browser_->OpenBookmarkManagerForNode(parent_->id()); ->>>>>>> .r143383 else -<<<<<<< .mine chrome::ShowBookmarkManager(browser); -======= - browser_->OpenBookmarkManager(); ->>>>>>> .r143383 break; } |