Remove accidental #if's. Make old folder window menu go away when mousing ove...

chrome/browser/cocoa/bookmark_bar_folder_controller.mm

 // Copyright (c) 2010 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/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #import "chrome/browser/browser_theme_provider.h"
@@ skipping 56 matching lines @@
 @implementation BookmarkBarFolderController
 
 - (id)initWithParentButton:(BookmarkButton*)button
           parentController:(BookmarkBarFolderController*)parentController
              barController:(BookmarkBarController*)barController {
   NSString* nibPath =
       [mac_util::MainAppBundle() pathForResource:@"BookmarkBarFolderWindow"
                                           ofType:@"nib"];
   if ((self = [super initWithWindowNibPath:nibPath owner:self])) {
     parentButton_.reset([button retain]);
-#if 1
-    // We want the button to remain bordered as part of the menu path.
-    [[button cell] setShowsBorderOnlyWhileMouseInside:NO];
-#endif
     parentController_.reset([parentController retain]);
     barController_ = barController;  // WEAK
     buttons_.reset([[NSMutableArray alloc] init]);
     folderTarget_.reset([[BookmarkFolderTarget alloc] initWithController:self]);
     [self configureWindow];
     hoverState_.reset([[BookmarkBarFolderHoverState alloc] init]);
     if (scrollable_)
       [self addOrUpdateScrollTracking];
   }
   return self;
 }
 
 - (void)dealloc {
-#if 1
-  // The button is no longer part of the menu path.
-  [[parentButton_ cell] setShowsBorderOnlyWhileMouseInside:YES];
-  [parentButton_ setNeedsDisplay];
-#endif
   [self removeScrollTracking];
   [self endScroll];
   [hoverState_ draggingExited];
   // Note: we don't need to
   //   [NSObject cancelPreviousPerformRequestsWithTarget:self];
   // Because all of our performSelector: calls use withDelay: which
   // retains us.
   [super dealloc];
 }
 
@@ skipping 434 matching lines @@
   // First scroll the "document" area.
   NSPoint scrollPosition = [scrollView_ documentVisibleRect].origin;
   scrollPosition.y -= delta;
   [[scrollView_ documentView] scrollPoint:scrollPosition];
 
   // On 10.6 event dispatch for an NSButtonCell's
   // showsBorderOnlyWhileMouseInside seems broken if scrolling the
   // view that contains the button.  It appears that a mouseExited:
   // gets lost, so the button stays highlit forever.  We accomodate
   // here.
-#if 0
   if (buttonThatMouseIsIn_) {
     [[buttonThatMouseIsIn_ cell] setShowsBorderOnlyWhileMouseInside:NO];
     [[buttonThatMouseIsIn_ cell] setShowsBorderOnlyWhileMouseInside:YES];
   }
-#endif
 
   // We update the window size after shifting the scroll to avoid a race.
   CGFloat screenHeightMinusMargin = (NSHeight(screenFrame) -
                                      (2 * kScrollWindowVerticalMargin));
   if (delta) {
     // If we can, grow the window (up).
     if (NSHeight(windowFrame) < screenHeightMinusMargin) {
       CGFloat growAmount = delta;
       // Don't scroll more than enough to "finish".
       if (scrollPosition.y < 0)
@@ skipping 527 matching lines @@
 - (IBAction)openBookmarkInNewForegroundTab:(id)sender {
   [barController_ openBookmarkInNewForegroundTab:sender];
 }
 
 - (IBAction)openBookmarkInNewWindow:(id)sender {
   [barController_ openBookmarkInNewWindow:sender];
 }
 
 
 @end  // BookmarkBarFolderController