[Mac] Delete more bookmark bar folder code. This removes things that were missed last time.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 192 matching lines @@
 
 - (void)addNode:(const BookmarkNode*)child toMenu:(NSMenu*)menu;
 - (void)addFolderNode:(const BookmarkNode*)node toMenu:(NSMenu*)menu;
 - (void)tagEmptyMenu:(NSMenu*)menu;
 - (void)clearMenuTagMap;
 - (int)preferredHeight;
 - (void)addNonBookmarkButtonsToView;
 - (void)addButtonsToView;
 - (void)centerNoItemsLabel;
 - (void)setNodeForBarMenu;
-- (void)watchForExitEvent:(BOOL)watch;
 - (void)resetAllButtonPositionsWithAnimation:(BOOL)animate;
 - (BOOL)animationEnabled;
 
 @end
 
 @implementation BookmarkBarController
 
 @synthesize visualState = visualState_;
 @synthesize lastVisualState = lastVisualState_;
 @synthesize delegate = delegate_;
@@ skipping 95 matching lines @@
 
   // For safety, make sure the buttons can no longer call us.
   for (BookmarkButton* button in buttons_.get()) {
     [button setDelegate:nil];
     [button setTarget:nil];
     [button setAction:nil];
   }
 
   bridge_.reset(NULL);
   [[NSNotificationCenter defaultCenter] removeObserver:self];
-  [self watchForExitEvent:NO];
   [super dealloc];
 }
 
 - (void)awakeFromNib {
   // We default to NOT open, which means height=0.
   DCHECK([[self view] isHidden]);  // Hidden so it's OK to change.
 
   // Set our initial height to zero, since that is what the superview
   // expects.  We will resize ourselves open later if needed.
   [[self view] setFrame:NSMakeRect(0, 0, initialWidth_, 0)];
@@ skipping 172 matching lines @@
       node == bookmarkModel_->bookmark_bar_node() ||
       node == bookmarkModel_->other_node() ||
       node == bookmarkModel_->synced_node())
     return NO;
   return YES;
 }
 
 #pragma mark Actions
 
 - (IBAction)openBookmark:(id)sender {
-  BOOL isMenuItem = [[sender cell] isFolderButtonCell];
+  BOOL isMenuItem = [sender isFolder];
   BOOL animate = isMenuItem && [self animationEnabled];
   DCHECK([sender respondsToSelector:@selector(bookmarkNode)]);
   const BookmarkNode* node = [sender bookmarkNode];
   WindowOpenDisposition disposition =
       event_utils::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
   RecordAppLaunch(browser_->profile(), node->url());
   [self openURL:node->url() disposition:disposition];
 
   if (!animate)
     [self closeFolderAndStopTrackingMenus];
@@ skipping 239 matching lines @@
     // If we just deleted the last item in an off-the-side menu so the
     // button will be going away, make sure the menu goes away.
     if (folderController_ &&
         ([folderController_ parentButton] == offTheSideButton_))
       [self closeAllBookmarkFolders];
     // (And hide the button, too.)
     [offTheSideButton_ setHidden:YES];
   }
 }
 
-// Main menubar observation code, so we can know to close our fake menus if the
-// user clicks on the actual menubar, as multiple unconnected menus sharing
-// the screen looks weird.
-// Needed because the hookForEvent method doesn't see the click on the menubar.
-
-// Gets called when the menubar is clicked.
-- (void)begunTracking:(NSNotification *)notification {
-  [self closeFolderAndStopTrackingMenus];
-}
-
-// Install the callback.
-- (void)startObservingMenubar {
-  NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-  [nc addObserver:self
-         selector:@selector(begunTracking:)
-             name:NSMenuDidBeginTrackingNotification
-           object:[NSApp mainMenu]];
-}
-
-// Remove the callback.
-- (void)stopObservingMenubar {
-  NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-  [nc removeObserver:self
-                name:NSMenuDidBeginTrackingNotification
-              object:[NSApp mainMenu]];
-}
-
-// End of menubar observation code.
-
-// Begin (or end) watching for a click outside this window.  Unlike
-// normal NSWindows, bookmark folder "fake menu" windows do not become
-// key or main.  Thus, traditional notification (e.g. WillResignKey)
-// won't work.  Our strategy is to watch (at the app level) for a
-// "click outside" these windows to detect when they logically lose
-// focus.
-- (void)watchForExitEvent:(BOOL)watch {
-  CrApplication* app = static_cast<CrApplication*>([NSApplication
-                                                    sharedApplication]);
-  DCHECK([app isKindOfClass:[CrApplication class]]);
-  if (watch) {
-    if (!watchingForExitEvent_) {
-      [app addEventHook:self];
-      [self startObservingMenubar];
-    }
-  } else {
-    if (watchingForExitEvent_) {
-      [app removeEventHook:self];
-      [self stopObservingMenubar];
-    }
-  }
-  watchingForExitEvent_ = watch;
-}
-
 // Keep the "no items" label centered in response to a frame size change.
 - (void)centerNoItemsLabel {
   // Note that this computation is done in the parent's coordinate system,
   // which is unflipped. Also, we want the label to be a fixed distance from
   // the bottom, so that it slides up properly (on animating to hidden).
   // The textfield sits in the itemcontainer, so to center it we maintain
   // equal vertical padding on the top and bottom.
   int yoffset = (NSHeight([[buttonView_ noItemTextfield] frame]) -
                  NSHeight([[buttonView_ noItemContainer] frame])) / 2;
   [[buttonView_ noItemContainer] setFrameOrigin:NSMakePoint(0, yoffset)];
@@ skipping 851 matching lines @@
   NSColor* color =
       themeProvider->GetNSColor(ThemeService::COLOR_BOOKMARK_TEXT,
                                 true);
   for (BookmarkButton* button in buttons_.get()) {
     BookmarkButtonCell* cell = [button cell];
     [cell setTextColor:color];
   }
   [[otherBookmarksButton_ cell] setTextColor:color];
 }
 
-// Return YES if the event indicates an exit from the bookmark bar
-// folder menus.  E.g. "click outside" of the area we are watching.
-// At this time we are watching the area that includes all popup
-// bookmark folder windows.
-- (BOOL)isEventAnExitEvent:(NSEvent*)event {
-  NSWindow* eventWindow = [event window];
-  NSWindow* myWindow = [[self view] window];
-  switch ([event type]) {
-    case NSLeftMouseDown:
-    case NSRightMouseDown:
-      // If the click is in my window but NOT in the bookmark bar, consider
-      // it a click 'outside'. Clicks directly on an active button (i.e. one
-      // that is a folder and for which its folder menu is showing) are 'in'.
-      // All other clicks on the bookmarks bar are counted as 'outside'
-      // because they should close any open bookmark folder menu.
-      if (eventWindow == myWindow) {
-        NSView* hitView =
-            [[eventWindow contentView] hitTest:[event locationInWindow]];
-        if (hitView == [folderController_ parentButton])
-          return NO;
-        if (![hitView isDescendantOf:[self view]] || hitView == buttonView_)
-          return YES;
-      }
-      break;
-    case NSKeyDown: {
-      // Event hooks often see the same keydown event twice due to the way key
-      // events get dispatched and redispatched, so ignore if this keydown
-      // event has the EXACT same timestamp as the previous keydown.
-      static NSTimeInterval lastKeyDownEventTime;
-      NSTimeInterval thisTime = [event timestamp];
-      if (lastKeyDownEventTime != thisTime) {
-        lastKeyDownEventTime = thisTime;
-        if ([event modifierFlags] & NSCommandKeyMask)
-          return YES;
-      }
-      return NO;
-    }
-    case NSKeyUp:
-      return NO;
-    case NSLeftMouseDragged:
-      // We can get here with the following sequence:
-      // - open a bookmark folder
-      // - right-click (and unclick) on it to open context menu
-      // - move mouse to window titlebar then click-drag it by the titlebar
-      // http://crbug.com/49333
-      return NO;
-    default:
-      break;
-  }
-  return NO;
-}
-
 #pragma mark Drag & Drop
 
 // Find something like std::is_between<T>?  I can't believe one doesn't exist.
 static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   return ((value >= low) && (value <= high));
 }
 
 // Return the proposed drop target for a hover open button from the
 // given array, or nil if none.  We use this for distinguishing
 // between a hover-open candidate or drop-indicator draw.
@@ skipping 466 matching lines @@
   [button setHidden:NO];
   [self resetAllButtonPositionsWithAnimation:YES];
 }
 
 
 #pragma mark BookmarkButtonControllerProtocol
 
 // Close all bookmark folders.  "Folder" here is the fake menu for
 // bookmark folders, not a button context menu.
 - (void)closeAllBookmarkFolders {
-  [self watchForExitEvent:NO];
   [folderController_ closeMenu];
   folderController_ = nil;
 }
 
 - (void)closeBookmarkFolder:(id)sender {
   // We're the top level, so close one means close them all.
   [self closeAllBookmarkFolders];
 }
 
 - (BookmarkModel*)bookmarkModel {
@@ skipping 166 matching lines @@
     [self closeAllBookmarkFolders];
 
   // Folder controller, like many window controllers, owns itself.
   folderController_ =
       [[BookmarkBarFolderController alloc] initWithParentButton:parentButton
                                                   bookmarkModel:bookmarkModel_
                                                   barController:self];
   [folderController_ autorelease];
   [folderController_ openMenu];
 
-  // Only BookmarkBarController has this; the
-  // BookmarkBarFolderController does not.
-  [self watchForExitEvent:YES];
-
   // No longer need to hold the lock; the folderController_ now owns it.
   [browserController releaseBarVisibilityForOwner:self
                                     withAnimation:NO
                                             delay:NO];
 }
 
 - (void)openAll:(const BookmarkNode*)node
     disposition:(WindowOpenDisposition)disposition {
   [self closeFolderAndStopTrackingMenus];
   bookmark_utils::OpenAll([[self view] window],
@@ skipping 131 matching lines @@
 
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return nil;
 }
 
-#pragma mark BookmarkButtonControllerProtocol
-
-// NOT an override of a standard Cocoa call made to NSViewControllers.
-- (void)hookForEvent:(NSEvent*)theEvent {
-  if ([self isEventAnExitEvent:theEvent])
-    [self closeFolderAndStopTrackingMenus];
-}
-
 #pragma mark TestingAPI Only
 
 - (NSMenu*)buttonContextMenu {
   return buttonContextMenu_;
 }
 
 // Intentionally ignores ownership issues; used for testing and we try
 // to minimize touching the object passed in (likely a mock).
 - (void)setButtonContextMenu:(id)menu {
   buttonContextMenu_ = menu;
 }
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 @end