(Mac) Display the bookmark bar off-the-side menu on mouse down. Also align the menu.

chrome/browser/cocoa/bookmark_bar_controller.mm

 // 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 "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #import "chrome/browser/cocoa/bookmark_bar_bridge.h"
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #import "chrome/browser/cocoa/bookmark_name_folder_controller.h"
 #import "chrome/browser/cocoa/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/cocoa/event_utils.h"
+#import "chrome/browser/cocoa/menu_button.h"
 #import "chrome/browser/cocoa/view_resizer.h"
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "skia/ext/skia_utils_mac.h"
 
 // Specialization of NSButton that responds to middle-clicks. By default,
 // NSButton ignores them.
 @interface BookmarkButton : NSButton
@@ skipping 66 matching lines @@
   bridge_.reset(new BookmarkBarBridge(self, bookmarkModel_));
 
   // When resized we may need to add new buttons, or remove them (if
   // no longer visible), or add/remove the "off the side" menu.
   [[self view] setPostsFrameChangedNotifications:YES];
   [[NSNotificationCenter defaultCenter]
     addObserver:self
        selector:@selector(frameDidChange)
            name:NSViewFrameDidChangeNotification
          object:[self view]];
+
+  DCHECK([offTheSideButton_ menu]);
 }
 
 - (void)showIfNeeded {
   if (profile_->GetPrefs()->GetBoolean(prefs::kShowBookmarkBar))
     [self showBookmarkBar:YES immediately:YES];
 }
 
 // Check if we should enable the off-the-side button.
 // TODO(jrg): when we are smarter about creating buttons (e.g. don't
 // bother creating buttons which aren't visible), we'll have to be
@@ skipping 173 matching lines @@
 // Called from a Folder bookmark button.
 - (IBAction)openFolderMenuFromButton:(id)sender {
   NSMenu* menu = [self menuForFolderNode:[self nodeFromButton:sender]];
   if (menu) {
     [NSMenu popUpContextMenu:menu
                    withEvent:[NSApp currentEvent]
                      forView:sender];
   }
 }
 
-// TODO(jrg): cache the menu so we don't need to build it every time.
+// Rebuild the off-the-side menu, taking into account which buttons are
+// displayed.
+// TODO(jrg,viettrungluu): only (re)build the menu when necessary.
 // TODO(jrg): if we get smarter such that we don't even bother
 //   creating buttons which aren't visible, we'll need to be smarter
 //   here.
-- (IBAction)openOffTheSideMenuFromButton:(id)sender {
-  scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
+- (void)buildOffTheSideMenu {
+  NSMenu* menu = [self offTheSideMenu];
+  DCHECK(menu);
+
+  // Remove old menu items (backwards order is as good as any); leave the
+  // blank one at position 0 (see menu_button.h).
+  for (NSInteger i = [menu numberOfItems] - 1; i >= 1 ; i--)
+    [menu removeItemAtIndex:i];
+
+  // Add items corresponding to buttons which aren't displayed or are only
+  // partly displayed.
   for (NSButton* each_button in buttons_.get()) {
     if (NSMaxX([each_button frame]) >
         NSMaxX([[each_button superview] frame])) {
-      [self addNode:[self nodeFromButton:each_button] toMenu:menu.get()];
+      [self addNode:[self nodeFromButton:each_button] toMenu:menu];
     }
   }
+}
 
-  // TODO(jrg): once we disable the button when the menu should be
-  // empty, remove this 'helper'.
-  if (![menu numberOfItems]) {
-    [self tagEmptyMenu:menu];
-  }
+// Get the off-the-side menu.
+- (NSMenu*)offTheSideMenu {
+  return [offTheSideButton_ menu];
+}
 
-  [NSMenu popUpContextMenu:menu
-                 withEvent:[NSApp currentEvent]
-                   forView:sender];
+// Called by any menus which have set us as their delegate (right now just the
+// off-the-side menu?).
+- (void)menuNeedsUpdate:(NSMenu*)menu {
+  if (menu == [self offTheSideMenu])
+    [self buildOffTheSideMenu];
 }
 
 // As a convention we set the menu's delegate to be the button's cell
 // so we can easily obtain bookmark info.  Convention applied in
 // -[BookmarkButtonCell menu].
 
 - (IBAction)openBookmarkInNewForegroundTab:(id)sender {
   BookmarkNode* node = [self nodeFromMenuItem:sender];
   [urlDelegate_ openBookmarkURL:node->GetURL() disposition:NEW_FOREGROUND_TAB];
 }
@@ skipping 312 matching lines @@
 
 - (void)setUrlDelegate:(id<BookmarkURLOpener>)urlDelegate {
   urlDelegate_ = urlDelegate;
 }
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 @end