Add mobile bookmarks folder to Mac bookmark menus (system and wrench), when the folder is non-empty.

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm

 // 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.
 
 #import <AppKit/AppKit.h>
 
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/app_controller_mac.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/mac/nsimage_cache.h"
 
-BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile,
-                                       NSMenu *menu)
+BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile, NSMenu* menu)
     : menuIsValid_(false),
       profile_(profile),
       controller_([[BookmarkMenuCocoaController alloc] initWithBridge:this
                                                               andMenu:menu]) {
   if (GetBookmarkModel())
     ObserveBookmarkModel();
 }
 
 BookmarkMenuBridge::~BookmarkMenuBridge() {
-  BookmarkModel *model = GetBookmarkModel();
+  BookmarkModel* model = GetBookmarkModel();
   if (model)
     model->RemoveObserver(this);
   [controller_ release];
 }
 
 NSMenu* BookmarkMenuBridge::BookmarkMenu() {
   return [controller_ menu];
 }
 
 void BookmarkMenuBridge::Loaded(BookmarkModel* model, bool ids_reassigned) {
   InvalidateMenu();
 }
 
 void BookmarkMenuBridge::UpdateMenu(NSMenu* bookmark_menu) {
   UpdateMenuInternal(bookmark_menu, false);
 }
 
 void BookmarkMenuBridge::UpdateSubMenu(NSMenu* bookmark_menu) {
   UpdateMenuInternal(bookmark_menu, true);
 }
 
 void BookmarkMenuBridge::UpdateMenuInternal(NSMenu* bookmark_menu,
                                             bool is_submenu) {
   DCHECK(bookmark_menu);
   if (menuIsValid_)
     return;
+
   BookmarkModel* model = GetBookmarkModel();
   if (!model || !model->IsLoaded())
     return;
 
   if (!folder_image_) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     folder_image_.reset(
         [rb.GetNativeImageNamed(IDR_BOOKMARK_BAR_FOLDER) retain]);
   }
 
   ClearBookmarkMenu(bookmark_menu);
 
   // Add bookmark bar items, if any.
   const BookmarkNode* barNode = model->bookmark_bar_node();
   CHECK(barNode);
   if (!barNode->empty()) {
     [bookmark_menu addItem:[NSMenuItem separatorItem]];
     AddNodeToMenu(barNode, bookmark_menu, !is_submenu);
   }
 
   // If the "Other Bookmarks" folder has any content, make a submenu for it and
   // fill it in.
   if (!model->other_node()->empty()) {
-    NSString* other_items_title =
-        l10n_util::GetNSString(IDS_BOOKMARK_BAR_OTHER_FOLDER_NAME);
     [bookmark_menu addItem:[NSMenuItem separatorItem]];
     AddNodeAsSubmenu(bookmark_menu,
                      model->other_node(),
-                     other_items_title,
                      !is_submenu);
   }
 
+  // If the "Mobile Bookmarks" folder has any content, make a submenu for it and
+  // fill it in.
+  if (!model->mobile_node()->empty()) {
+    // Add a separator if we did not already add one due to a non-empty
+    // "Other Bookmarks" folder.
+    if (model->other_node()->empty())
+      [bookmark_menu addItem:[NSMenuItem separatorItem]];
+
+    AddNodeAsSubmenu(bookmark_menu,
+                     model->mobile_node(),
+                     !is_submenu);
+  }
+
   menuIsValid_ = true;
 }
 
 void BookmarkMenuBridge::BookmarkModelBeingDeleted(BookmarkModel* model) {
   NSMenu* bookmark_menu = BookmarkMenu();
   if (bookmark_menu == nil)
     return;
 
   ClearBookmarkMenu(bookmark_menu);
 }
@@ skipping 84 matching lines @@
       // any.
       [menu removeItem:item];
     } else {
       // Leave it alone.
     }
   }
 }
 
 void BookmarkMenuBridge::AddNodeAsSubmenu(NSMenu* menu,
                                           const BookmarkNode* node,
-                                          NSString* title,
                                           bool add_extra_items) {
+  NSString* title = SysUTF16ToNSString(node->GetTitle());
   NSMenuItem* items = [[[NSMenuItem alloc]
-                               initWithTitle:title
-                                      action:nil
-                               keyEquivalent:@""] autorelease];
+                            initWithTitle:title
+                                   action:nil
+                            keyEquivalent:@""] autorelease];
   [items setImage:folder_image_];
   [menu addItem:items];
-  NSMenu* other_submenu = [[[NSMenu alloc] initWithTitle:title]
-                            autorelease];
-  [menu setSubmenu:other_submenu forItem:items];
-  AddNodeToMenu(node, other_submenu, add_extra_items);
+  NSMenu* submenu = [[[NSMenu alloc] initWithTitle:title] autorelease];
+  [menu setSubmenu:submenu forItem:items];
+  AddNodeToMenu(node, submenu, add_extra_items);
 }
 
 // TODO(jrg): limit the number of bookmarks in the menubar?
 void BookmarkMenuBridge::AddNodeToMenu(const BookmarkNode* node, NSMenu* menu,
                                        bool add_extra_items) {
   int child_count = node->child_count();
   if (!child_count) {
     NSString* empty_string = l10n_util::GetNSString(IDS_MENU_EMPTY_SUBMENU);
     NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:empty_string
                                                    action:nil
@@ skipping 87 matching lines @@
 
 NSMenuItem* BookmarkMenuBridge::MenuItemForNode(const BookmarkNode* node) {
   if (!node)
     return nil;
   std::map<const BookmarkNode*, NSMenuItem*>::iterator it =
       bookmark_nodes_.find(node);
   if (it == bookmark_nodes_.end())
     return nil;
   return it->second;
 }