[Mac] Fix handling of download shelf auto close.

chrome/browser/ui/cocoa/download/download_shelf_controller.h

 // Copyright (c) 2012 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 <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
+#include "ui/base/cocoa/tracking_area.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
 
 @class AnimatableView;
 class Browser;
 @class BrowserWindowController;
 @class DownloadItemController;
 class DownloadShelf;
 @class DownloadShelfView;
 @class HyperlinkButtonCell;
 @class HoverButton;
@@ skipping 17 matching lines @@
 // download_item_mac bridges calls from chromium's c++ world to the objc
 // download_item_controller, which is responsible for managing a single item
 // on the shelf. The item controller loads its UI from a xib file, where the
 // UI of an item itself is represented by a button that is drawn by
 // download_item_cell.
 
 @interface DownloadShelfController : NSViewController<NSTextViewDelegate> {
  @private
   IBOutlet HoverButton* hoverCloseButton_;
 
+  // YES if the download shelf is intended to be displayed. The shelf animates
+  // out when it is closing. During this time, barIsVisible_ is NO although the
+  // shelf is still visible on screen.
   BOOL barIsVisible_;
 
+  // YES if the containing browser window is fullscreen.
   BOOL isFullscreen_;
 
+  // YES if the shelf should be closed when the mouse leaves the shelf.
+  BOOL shouldCloseOnMouseExit_;
+
+  // YES if the mouse is currently over the download shelf.
+  BOOL isMouseInsideView_;
+
   scoped_ptr<DownloadShelf> bridge_;
 
   // Height of the shelf when it's fully visible.
   CGFloat maxShelfHeight_;
 
   // Current height of the shelf. Changes while the shelf is animating in or
   // out.
   CGFloat currentShelfHeight_;
 
-  // Used to autoclose the shelf when the mouse is moved off it.  Is non-nil
-  // only when a subsequent mouseExited event can trigger autoclose or when a
-  // subsequent mouseEntered event will cancel autoclose.  Is nil otherwise.
-  scoped_nsobject<NSTrackingArea> trackingArea_;
+  // Used to autoclose the shelf when the mouse is moved off it.
+  ui::ScopedCrTrackingArea trackingArea_;
 
   // The download items we have added to our shelf.
   scoped_nsobject<NSMutableArray> downloadItemControllers_;
 
   // The container that contains (and clamps) all the download items.
   IBOutlet NSView* itemContainerView_;
 
   // Delegate that handles resizing our view.
   id<ViewResizer> resizeDelegate_;
 
@@ skipping 22 matching lines @@
 // Returns our view cast as an AnimatableView.
 - (AnimatableView*)animatableView;
 
 - (DownloadShelf*)bridge;
 - (BOOL)isVisible;
 
 // Add a new download item to the leftmost position of the download shelf. The
 // item should not have been already added to this shelf.
 - (void)addDownloadItem:(content::DownloadItem*)downloadItem;
 
+// Similar to addDownloadItem above, but adds a DownloadItemController.
+- (void)add:(DownloadItemController*)download;
+
 // Remove a download, possibly via clearing browser data.
 - (void)remove:(DownloadItemController*)download;
 
 // Called by individual item controllers when their downloads are opened.
 - (void)downloadWasOpened:(DownloadItemController*)download;
 
 // Notification that we are closing and should release our downloads.
 - (void)exiting;
 
 // Return the height of the download shelf.
 - (float)height;
 
 // Re-layouts all download items based on their current state.
 - (void)layoutItems;
 
 @end