Adds a bookmark menu. This is experimental. To turn on you need...

chrome/browser/bookmarks/bookmark_menu_controller.cc

 // Copyright (c) 2009 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_menu_controller.h"
 
 #include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/common/os_exchange_data.h"
+#include "chrome/common/l10n_util.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/resource_bundle.h"
+#include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 
 BookmarkMenuController::BookmarkMenuController(Browser* browser,
                                                Profile* profile,
                                                PageNavigator* navigator,
                                                HWND hwnd,
                                                BookmarkNode* node,
-                                               int start_child_index)
+                                               int start_child_index,
+                                               bool show_other_folder)
     : browser_(browser),
       profile_(profile),
       page_navigator_(navigator),
       hwnd_(hwnd),
       node_(node),
       observer_(NULL),
-      for_drop_(false) {
+      for_drop_(false),
+      show_other_folder_(show_other_folder) {
   menu_.reset(new views::MenuItemView(this));
   int next_menu_id = 1;
   menu_id_to_node_map_[menu_->GetCommand()] = node;
   menu_->set_has_icons(true);
   BuildMenu(node, start_child_index, menu_.get(), &next_menu_id);
+  if (show_other_folder)
+    BuildOtherFolderMenu(&next_menu_id);
 }
 
 void BookmarkMenuController::RunMenuAt(
     const gfx::Rect& bounds,
     views::MenuItemView::AnchorPosition position,
     bool for_drop) {
   for_drop_ = for_drop;
   profile_->GetBookmarkModel()->AddObserver(this);
   if (for_drop) {
     menu_->RunMenuForDropAt(hwnd_, bounds, position);
@@ skipping 51 matching lines @@
     views::MenuItemView* item,
     const views::DropTargetEvent& event,
     DropPosition* position) {
   // Should only get here if we have drop data.
   DCHECK(drop_data_.is_valid());
 
   BookmarkNode* node = menu_id_to_node_map_[item->GetCommand()];
   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 41 matching lines @@
   context_menu_->RunMenuAt(x, y);
   context_menu_.reset(NULL);
   return true;
 }
 
 void BookmarkMenuController::DropMenuClosed(views::MenuItemView* menu) {
   delete this;
 }
 
 bool BookmarkMenuController::CanDrag(views::MenuItemView* menu) {
-  return true;
+  BookmarkNode* node = menu_id_to_node_map_[menu->GetCommand()];
+  // Don't let users drag the other folder.
+  return node->GetParent() != profile_->GetBookmarkModel()->root_node();
 }
 
 void BookmarkMenuController::WriteDragData(views::MenuItemView* sender,
                                            OSExchangeData* data) {
   DCHECK(sender && data);
 
   UserMetrics::RecordAction(L"BookmarkBar_DragFromFolder", profile_);
 
   BookmarkDragData drag_data(menu_id_to_node_map_[sender->GetCommand()]);
   drag_data.Write(profile_, data);
 }
 
 int BookmarkMenuController::GetDragOperations(views::MenuItemView* sender) {
   return bookmark_utils::BookmarkDragOperation(
       menu_id_to_node_map_[sender->GetCommand()]);
 }
 
 void BookmarkMenuController::BookmarkModelChanged() {
   menu_->Cancel();
 }
 
 void BookmarkMenuController::BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                                        BookmarkNode* node) {
   if (node_to_menu_id_map_.find(node) != node_to_menu_id_map_.end())
     menu_->SetIcon(node->GetFavIcon(), node_to_menu_id_map_[node]);
 }
 
+void BookmarkMenuController::BuildOtherFolderMenu(int* next_menu_id) {
+  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);
+  views::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(BookmarkNode* parent,
                                        int start_child_index,
                                        views::MenuItemView* menu,
                                        int* next_menu_id) {
   DCHECK(!parent->GetChildCount() ||
          start_child_index < parent->GetChildCount());
   for (int i = start_child_index; i < parent->GetChildCount(); ++i) {
     BookmarkNode* node = parent->GetChild(i);
     int id = *next_menu_id;
 
@@ skipping 17 matching lines @@
     }
     menu_id_to_node_map_[id] = node;
   }
 }
 
 BookmarkMenuController::~BookmarkMenuController() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
   if (observer_)
     observer_->BookmarkMenuDeleted(this);
 }