Remove accidental #if's. Make old folder window menu go away when mousing over a non-folder bookmark in the bookmark bar.

BUG=None.
TEST=Pop up a folder bookmark item on the bookmark bar then mouse over a non-folder bookmark and verify that the old folder menu is dismissed.

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

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

2 files changed, 4 insertions, 15 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_controller.mm b/chrome/browser/cocoa/bookmark_bar_controller.mm
index 809cba4..7ab6095 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller.mm
@@ -452,11 +452,11 @@ const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
   // Else open a new one if it makes sense to do so.
   if ([sender bookmarkNode]->is_folder())
     [folderTarget_ openBookmarkFolderFromButton:sender];
-#if 1
-  else
+  else {
     // We're over a non-folder bookmark so close any old folders.
-    [self closeAllBookmarkFolders];
-#endif
+    [folderController_ close];
+    folderController_ = nil;
+  }
 }
 
 // BookmarkButtonDelegate protocol implementation.
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
index 461d555..2250e42c 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
@@ -74,10 +74,6 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
                                           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]);
@@ -91,11 +87,6 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
 }
 
 - (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];
@@ -550,12 +541,10 @@ const CGFloat kScrollWindowVerticalMargin = 0.0;
   // 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) -