Bookmark menus not updated when their name is edited in the bookmark bar.

BUG=http://crbug.com/23301
TEST=see bug

Review URL: http://codereview.chromium.org/245035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27502 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/bookmark_menu_bridge.mm b/chrome/browser/cocoa/bookmark_menu_bridge.mm
index 22a207f..70a0983 100644
--- a/chrome/browser/cocoa/bookmark_menu_bridge.mm
+++ b/chrome/browser/cocoa/bookmark_menu_bridge.mm
@@ -94,14 +94,14 @@ void BookmarkMenuBridge::BookmarkNodeChanged(BookmarkModel* model,
                                              const BookmarkNode* node) {
   NSMenuItem* item = MenuItemForNode(node);
   if (item)
-    ConfigureMenuItem(node, item);
+    ConfigureMenuItem(node, item, true);
 }
 
 void BookmarkMenuBridge::BookmarkNodeFavIconLoaded(BookmarkModel* model,
                                                    const BookmarkNode* node) {
   NSMenuItem* item = MenuItemForNode(node);
   if (item)
-    ConfigureMenuItem(node, item);
+    ConfigureMenuItem(node, item, false);
 }
 
 void BookmarkMenuBridge::BookmarkNodeChildrenReordered(
@@ -180,13 +180,18 @@ void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu) {
       [menu setSubmenu:submenu forItem:item];
       AddNodeToMenu(child, submenu);  // recursive call
     } else {
-      ConfigureMenuItem(child, item);
+      ConfigureMenuItem(child, item, false);
     }
   }
 }
 
 void BookmarkMenuBridge::ConfigureMenuItem(const BookmarkNode* node,
-                                           NSMenuItem* item) {
+                                           NSMenuItem* item,
+                                           bool set_title) {
+  if (set_title) {
+    NSString* title = [BookmarkMenuCocoaController menuTitleForNode:node];
+    [item setTitle:title];
+  }
   [item setTarget:controller_];
   [item setAction:@selector(openBookmarkMenuItem:)];
   [item setTag:node->id()];