Remove the bookmark menu.

chrome/browser/views/bookmark_menu_controller_views.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/views/bookmark_menu_controller_views.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "app/resource_bundle.h"
 #include "base/stl_util-inl.h"
@@ skipping 11 matching lines @@
 #include "grit/theme_resources.h"
 #include "views/controls/button/menu_button.h"
 
 using views::MenuItemView;
 
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                Profile* profile,
                                                PageNavigator* navigator,
                                                gfx::NativeWindow parent,
                                                const BookmarkNode* node,
-                                               int start_child_index,
-                                               bool show_other_folder)
+                                               int start_child_index)
     : browser_(browser),
       profile_(profile),
       page_navigator_(navigator),
       parent_(parent),
       node_(node),
       menu_(NULL),
       observer_(NULL),
       for_drop_(false),
-      show_other_folder_(show_other_folder),
       bookmark_bar_(NULL),
       next_menu_id_(1) {
   menu_ = CreateMenu(node, start_child_index);
 }
 
 void BookmarkMenuController::RunMenuAt(BookmarkBarView* bookmark_bar,
                                        bool for_drop) {
   bookmark_bar_ = bookmark_bar;
   views::MenuButton* menu_button = bookmark_bar_->GetMenuButtonForNode(node_);
   DCHECK(menu_button);
@@ skipping 92 matching lines @@
     MenuItemView* item,
     const views::DropTargetEvent& event,
     DropPosition* position) {
   // Should only get here if we have drop data.
   DCHECK(drop_data_.is_valid());
 
   const BookmarkNode* node = menu_id_to_node_map_[item->GetCommand()];
   const BookmarkNode* drop_parent = node->GetParent();
   int index_to_drop_at = drop_parent->IndexOfChild(node);
   if (*position == DROP_AFTER) {
-    if (node == profile_->GetBookmarkModel()->other_node()) {
-      // The other folder is shown after all bookmarks on the bookmark bar.
-      // Dropping after the other folder makes no sense.
-      *position = DROP_NONE;
-    }
     index_to_drop_at++;
   } else if (*position == DROP_ON) {
     drop_parent = node;
     index_to_drop_at = node->GetChildCount();
   }
   DCHECK(drop_parent);
   return bookmark_utils::BookmarkDropOperation(
       profile_, event, drop_data_, drop_parent, index_to_drop_at);
 }
 
@@ skipping 40 matching lines @@
   context_menu_->RunMenuAt(p);
   context_menu_.reset(NULL);
   return true;
 }
 
 void BookmarkMenuController::DropMenuClosed(MenuItemView* menu) {
   delete this;
 }
 
 bool BookmarkMenuController::CanDrag(MenuItemView* menu) {
-  const BookmarkNode* node = menu_id_to_node_map_[menu->GetCommand()];
-  // Don't let users drag the other folder.
-  return node->GetParent() != profile_->GetBookmarkModel()->root_node();
+  return true;
 }
 
 void BookmarkMenuController::WriteDragData(MenuItemView* sender,
                                            OSExchangeData* data) {
   DCHECK(sender && data);
 
   UserMetrics::RecordAction(UserMetricsAction("BookmarkBar_DragFromFolder"),
                             profile_);
 
   BookmarkDragData drag_data(menu_id_to_node_map_[sender->GetCommand()]);
   drag_data.Write(profile_, data);
 }
 
 int BookmarkMenuController::GetDragOperations(MenuItemView* sender) {
   return bookmark_utils::BookmarkDragOperation(
       menu_id_to_node_map_[sender->GetCommand()]);
 }
 
 views::MenuItemView* BookmarkMenuController::GetSiblingMenu(
     views::MenuItemView* menu,
     const gfx::Point& screen_point,
     views::MenuItemView::AnchorPosition* anchor,
     bool* has_mnemonics,
     views::MenuButton** button) {
-  if (show_other_folder_ || !bookmark_bar_ || for_drop_)
+  if (!bookmark_bar_ || for_drop_)
     return NULL;
   gfx::Point bookmark_bar_loc(screen_point);
   views::View::ConvertPointToView(NULL, bookmark_bar_, &bookmark_bar_loc);
   int start_index;
   const BookmarkNode* node =
       bookmark_bar_->GetNodeForButtonAt(bookmark_bar_loc, &start_index);
   if (!node || !node->is_folder())
     return NULL;
 
   MenuItemView* alt_menu = node_to_menu_map_[node];
@@ skipping 43 matching lines @@
   profile_->GetBookmarkModel()->AddObserver(this);
 }
 
 MenuItemView* BookmarkMenuController::CreateMenu(const BookmarkNode* parent,
                                                  int start_child_index) {
   MenuItemView* menu = new MenuItemView(this);
   menu->SetCommand(next_menu_id_++);
   menu_id_to_node_map_[menu->GetCommand()] = parent;
   menu->set_has_icons(true);
   BuildMenu(parent, start_child_index, menu, &next_menu_id_);
-  if (show_other_folder_)
-    BuildOtherFolderMenu(menu, &next_menu_id_);
   node_to_menu_map_[parent] = menu;
   return menu;
 }
 
-void BookmarkMenuController::BuildOtherFolderMenu(
-  MenuItemView* menu, int* next_menu_id) {
-  const BookmarkNode* other_folder = profile_->GetBookmarkModel()->other_node();
-  int id = *next_menu_id;
-  (*next_menu_id)++;
-  SkBitmap* folder_icon = ResourceBundle::GetSharedInstance().
-        GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
-  MenuItemView* submenu = menu->AppendSubMenuWithIcon(
-      id, l10n_util::GetString(IDS_BOOMARK_BAR_OTHER_BOOKMARKED), *folder_icon);
-  BuildMenu(other_folder, 0, submenu, next_menu_id);
-  menu_id_to_node_map_[id] = other_folder;
-}
-
 void BookmarkMenuController::BuildMenu(const BookmarkNode* parent,
                                        int start_child_index,
                                        MenuItemView* menu,
                                        int* next_menu_id) {
   DCHECK(!parent->GetChildCount() ||
          start_child_index < parent->GetChildCount());
   for (int i = start_child_index; i < parent->GetChildCount(); ++i) {
     const BookmarkNode* node = parent->GetChild(i);
     int id = *next_menu_id;
 
@@ skipping 82 matching lines @@
         break;
       }
     }
     if (ancestor_removed) {
       node_to_menu_id_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }