Fixes couple of issues with bookmarks in wrench menu:

chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc

 // Copyright (c) 2011 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/ui/views/bookmarks/bookmark_menu_delegate.h"
 
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
@@ skipping 23 matching lines @@
 
 BookmarkMenuDelegate::BookmarkMenuDelegate(Profile* profile,
                                            PageNavigator* navigator,
                                            gfx::NativeWindow parent,
                                            int first_menu_id)
     : profile_(profile),
       page_navigator_(navigator),
       parent_(parent),
       menu_(NULL),
       for_drop_(false),
+      parent_menu_item_(NULL),
       next_menu_id_(first_menu_id),
       real_delegate_(NULL),
       is_mutating_model_(false) {
 }
 
 BookmarkMenuDelegate::~BookmarkMenuDelegate() {
   profile_->GetBookmarkModel()->RemoveObserver(this);
   STLDeleteValues(&node_to_menu_map_);
 }
 
 void BookmarkMenuDelegate::Init(views::MenuDelegate* real_delegate,
                                 MenuItemView* parent,
                                 const BookmarkNode* node,
                                 int start_child_index,
                                 ShowOptions show_options) {
   profile_->GetBookmarkModel()->AddObserver(this);
   real_delegate_ = real_delegate;
   if (parent) {
+    parent_menu_item_ = parent;
     BuildMenu(node, start_child_index, parent, &next_menu_id_);
     if (show_options == SHOW_OTHER_FOLDER)
       BuildOtherFolderMenu(parent, &next_menu_id_);
   } else {
     menu_ = CreateMenu(node, start_child_index, show_options);
   }
 }
 
 void BookmarkMenuDelegate::SetActiveMenu(const BookmarkNode* node,
                                          int start_index) {
+  DCHECK(!parent_menu_item_);
   if (!node_to_menu_map_[node])
     CreateMenu(node, start_index, HIDE_OTHER_FOLDER);
   menu_ = node_to_menu_map_[node];
 }
 
 std::wstring BookmarkMenuDelegate::GetTooltipText(
     int id,
     const gfx::Point& screen_loc) {
   DCHECK(menu_id_to_node_map_.find(id) != menu_id_to_node_map_.end());
 
@@ skipping 190 matching lines @@
 
   // Iterate through the menus looking for the menu containing node.
   for (NodeToMenuMap::iterator i = node_to_menu_map_.begin();
        i != node_to_menu_map_.end(); ++i) {
     MenuItemView* menu_item = i->second->GetMenuItemByID(menu_pair->second);
     if (menu_item) {
       menu_item->SetIcon(model->GetFavicon(node));
       return;
     }
   }
+
+  if (parent_menu_item_) {
+    MenuItemView* menu_item = parent_menu_item_->GetMenuItemByID(
+        menu_pair->second);
+    if (menu_item)
+      menu_item->SetIcon(model->GetFavicon(node));
+  }
 }
 
 void BookmarkMenuDelegate::WillRemoveBookmarks(
     const std::vector<const BookmarkNode*>& bookmarks) {
   DCHECK(!is_mutating_model_);
   is_mutating_model_ = true;
   std::set<MenuItemView*> removed_menus;
   WillRemoveBookmarksImpl(bookmarks, &removed_menus);
   STLDeleteElements(&removed_menus);
 }
@@ skipping 67 matching lines @@
   }
 }
 
 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {
   for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin();
        i != node_to_menu_map_.end(); ++i) {
     MenuItemView* menu = i->second->GetMenuItemByID(id);
     if (menu)
       return menu;
   }
-  return NULL;
+
+  return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;
 }
 
 void BookmarkMenuDelegate::WillRemoveBookmarksImpl(
     const std::vector<const BookmarkNode*>& bookmarks,
     std::set<views::MenuItemView*>* removed_menus) {
   // Remove the observer so that when the remove happens we don't prematurely
   // cancel the menu. The observer ias added back in DidRemoveBookmarks.
   profile_->GetBookmarkModel()->RemoveObserver(this);
 
   // Remove the menu items.
@@ skipping 34 matching lines @@
         break;
       }
     }
     if (ancestor_removed) {
       node_to_menu_id_map_.erase(i++);
     } else {
       ++i;
     }
   }
 }