Windows/Views: delete native bookmark manager code.

chrome/browser/bookmarks/bookmark_context_menu_controller.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h"
-#include "chrome/browser/bookmarks/bookmark_manager.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/common/pref_names.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Returns true if the specified node is of type URL, or has a descendant
 // of type URL.
 bool NodeHasURLs(const BookmarkNode* node) {
   if (node->is_url())
     return true;
 
   for (int i = 0; i < node->GetChildCount(); ++i) {
     if (NodeHasURLs(node->GetChild(i)))
       return true;
   }
   return false;
 }
 
-// SelectOnCreationHandler ----------------------------------------------------
-
-// Used when adding a new bookmark. If a new bookmark is created it is selected
-// in the bookmark manager.
-class SelectOnCreationHandler : public BookmarkEditor::Handler {
- public:
-  explicit SelectOnCreationHandler(Profile* profile) : profile_(profile) {
-  }
-
-  virtual void NodeCreated(const BookmarkNode* new_node) {
-// TODO(viettrungluu): I don't know if this is really needed, but it'll be
-// deleted soon.
-#if defined(OS_WIN)
-    BookmarkManager::SelectInTree(profile_, new_node);
-#endif
-  }
-
- private:
-  Profile* profile_;
-
-  DISALLOW_COPY_AND_ASSIGN(SelectOnCreationHandler);
-};
-
 }  // namespace
 
 BookmarkContextMenuController::BookmarkContextMenuController(
     gfx::NativeWindow parent_window,
     BookmarkContextMenuControllerDelegate* delegate,
     Profile* profile,
     PageNavigator* navigator,
     const BookmarkNode* parent,
     const std::vector<const BookmarkNode*>& selection,
     ConfigurationType configuration)
@@ skipping 34 matching lines @@
     }
     AddSeparator();
   }
 
   if (selection_.size() == 1 && selection_[0]->is_folder()) {
     AddItem(IDS_BOOKMARK_BAR_RENAME_FOLDER);
   } else {
     AddItem(IDS_BOOKMARK_BAR_EDIT);
   }
 
-// TODO(viettrungluu): I don't know if this is really needed, but it'll be
-// deleted soon.
-#if defined(OS_WIN)
-  if (configuration_ == BOOKMARK_MANAGER_TABLE_OTHER ||
-      configuration_ == BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER) {
-    AddItem(IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER);
-  }
-#endif
-
   AddSeparator();
   AddItem(IDS_CUT);
   AddItem(IDS_COPY);
   AddItem(IDS_PASTE);
 
   AddSeparator();
   AddItem(IDS_BOOKMARK_BAR_REMOVE);
 
   if (configuration_ == BOOKMARK_MANAGER_ORGANIZE_MENU) {
     AddSeparator();
@@ skipping 95 matching lines @@
       }
       selection_.clear();
       break;
     }
 
     case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_Add"),
           profile_);
 
-      BookmarkEditor::Configuration editor_config;
-      BookmarkEditor::Handler* handler = NULL;
-      if (configuration_ == BOOKMARK_BAR) {
-        editor_config = BookmarkEditor::SHOW_TREE;
-      } else {
-        editor_config = BookmarkEditor::NO_TREE;
-        // This is owned by the BookmarkEditorView.
-        handler = new SelectOnCreationHandler(profile_);
-      }
+      BookmarkEditor::Configuration editor_config =
+          (configuration_ == BOOKMARK_BAR) ? BookmarkEditor::SHOW_TREE :
+                                             BookmarkEditor::NO_TREE;
       // TODO: this should honor the index from GetParentForNewNodes.
       BookmarkEditor::Show(
           parent_window_, profile_,
           bookmark_utils::GetParentForNewNodes(parent_, selection_, NULL),
-          BookmarkEditor::EditDetails(), editor_config,
-          handler);
+          BookmarkEditor::EditDetails(), editor_config, NULL);
       break;
     }
 
     case IDS_BOOMARK_BAR_NEW_FOLDER: {
       UserMetrics::RecordAction(
           UserMetricsAction("BookmarkBar_ContextMenu_NewFolder"),
           profile_);
       int index;
       const BookmarkNode* parent =
           bookmark_utils::GetParentForNewNodes(parent_, selection_, &index);
       uint32 details = BookmarkFolderEditorController::IS_NEW;
       if (configuration_ != BOOKMARK_BAR)
         details |= BookmarkFolderEditorController::SHOW_IN_MANAGER;
       BookmarkFolderEditorController::Show(profile_, parent_window_, parent,
                                            index, details);
       break;
     }
 
     case IDS_BOOMARK_BAR_ALWAYS_SHOW:
       bookmark_utils::ToggleWhenVisible(profile_);
       break;
 
-// TODO(viettrungluu): I don't know if this is really needed, but it'll be
-// deleted soon.
-#if defined(OS_WIN)
-    case IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER:
-      UserMetrics::RecordAction(
-          UserMetricsAction("BookmarkBar_ContextMenu_ShowInFolder"),
-          profile_);
-
-      if (selection_.size() != 1) {
-        NOTREACHED();
-        break;
-      }
-
-      BookmarkManager::SelectInTree(profile_, selection_[0]);
-      break;
-#endif
-
     case IDS_BOOKMARK_MANAGER:
       UserMetrics::RecordAction(UserMetricsAction("ShowBookmarkManager"),
                                 profile_);
       {
         Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
         if (browser)
           browser->OpenBookmarkManager();
         else
           NOTREACHED();
       }
@@ skipping 52 matching lines @@
     case IDS_BOOMARK_BAR_OPEN_ALL_NEW_WINDOW:
       return HasURLs();
 
     case IDS_BOOKMARK_BAR_RENAME_FOLDER:
     case IDS_BOOKMARK_BAR_EDIT:
       return selection_.size() == 1 && !is_root_node;
 
     case IDS_BOOKMARK_BAR_REMOVE:
       return !selection_.empty() && !is_root_node;
 
-// TODO(viettrungluu): I don't know if this is really needed, but it'll be
-// deleted soon.
-#if defined(OS_WIN)
-    case IDS_BOOKMARK_MANAGER_SHOW_IN_FOLDER:
-      return (configuration_ == BOOKMARK_MANAGER_TABLE_OTHER ||
-              configuration_ == BOOKMARK_MANAGER_ORGANIZE_MENU_OTHER) &&
-             selection_.size() == 1;
-#endif
-
     case IDS_BOOKMARK_MANAGER_SORT:
       return parent_ && parent_ != model_->root_node();
 
     case IDS_BOOMARK_BAR_NEW_FOLDER:
     case IDS_BOOMARK_BAR_ADD_NEW_BOOKMARK:
       return bookmark_utils::GetParentForNewNodes(
           parent_, selection_, NULL) != NULL;
 
     case IDS_COPY:
     case IDS_CUT:
@@ skipping 13 matching lines @@
     delegate_->CloseMenu();
 }
 
 bool BookmarkContextMenuController::HasURLs() const {
   for (size_t i = 0; i < selection_.size(); ++i) {
     if (NodeHasURLs(selection_[i]))
       return true;
   }
   return false;
 }