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

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.
 
 #import "chrome/browser/cocoa/bookmark_bar_controller.h"
 #include "app/l10n_util_mac.h"
 #include "app/resource_bundle.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
@@ skipping 434 matching lines @@
   // From here down: same logic as BookmarkBarFolderController.
   // TODO(jrg): find a way to share these 4 non-comment lines?
   // http://crbug.com/35966
 
   // If already opened, then we exited but re-entered the button, so do nothing.
   if ([folderController_ parentButton] == sender)
     return;
   // 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.
 - (void)mouseExitedButton:(id)sender event:(NSEvent*)event {
   // Don't care; do nothing.
   // This is different behavior that the folder menus.
 }
 
 // Begin (or end) watching for a click outside this window.  Unlike
 // normal NSWindows, bookmark folder "fake menu" windows do not become
@@ skipping 1676 matching lines @@
       // If this button is showing its menu then we need to move the menu, too.
       if (button == [folderController_ parentButton])
         [folderController_ offsetFolderMenuWindow:NSMakeSize(xOffset, 0.0)];
     }
     --displayedButtonCount_;
     [self reconfigureBookmarkBar];
   }
 }
 
 @end