Add "dangerous download" view on OS X, for now for dmg files. Also fix download item layout.

chrome/browser/cocoa/download_shelf_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/download_shelf_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/browser.h"
 #import "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/cocoa/browser_window_cocoa.h"
 #include "chrome/browser/cocoa/download_item_controller.h"
 #include "chrome/browser/cocoa/download_shelf_mac.h"
 #import "chrome/browser/cocoa/download_shelf_view.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
 const size_t kMaxDownloadItemCount = 16;
 
 // Border padding of a download item.
 const int kDownloadItemBorderPadding = 3;
 
-// Width of a download item, must match width in DownloadItem.xib.
-const int kDownloadItemWidth = 200;
-
-// Height of a download item, must match height in DownloadItem.xib.
-const int kDownloadItemHeight = 34;
-
 // Horizontal padding between two download items.
 const int kDownloadItemPadding = 10;
 
 // Duration for the open-new-leftmost-item animation, in seconds.
 const NSTimeInterval kDownloadItemOpenDuration = 0.8;
 
 }  // namespace
 
 @interface DownloadShelfController(Private)
 - (void)applyContentAreaOffset:(BOOL)apply;
 - (void)showDownloadShelf:(BOOL)enable;
 - (void)resizeDownloadLinkToFit;
+- (void)layoutItems:(BOOL)skipFirst;
 @end
 
 
 @implementation DownloadShelfController
 
 - (id)initWithBrowser:(Browser*)browser
        resizeDelegate:(id<ViewResizer>)resizeDelegate {
   if ((self = [super initWithNibName:@"DownloadShelf"
                               bundle:mac_util::MainAppBundle()])) {
     resizeDelegate_ = resizeDelegate;
     shelfHeight_ = [[self view] bounds].size.height;
 
     // Reset the download shelf's frame to zero.  It will be properly positioned
     // and sized the first time we try to set its height.
     [[self view] setFrame:NSZeroRect];
 
     downloadItemControllers_.reset([[NSMutableArray alloc] init]);
 
     // This calls show:, so it needs to be last.
     bridge_.reset(new DownloadShelfMac(browser, self));
   }
   return self;
 }
 
 - (void)awakeFromNib {
   // Initialize "Show all downloads" link.
 
   scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSParagraphStyle defaultParagraphStyle] mutableCopy]);
-  // TODO(thakis): left-align for RTL languages?
   [paragraphStyle.get() setAlignment:NSRightTextAlignment];
 
   NSDictionary* linkAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
       @"", NSLinkAttributeName,
       [NSCursor pointingHandCursor], NSCursorAttributeName,
       paragraphStyle.get(), NSParagraphStyleAttributeName,
       nil];
   NSString* text =
       base::SysWideToNSString(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS));
   scoped_nsobject<NSAttributedString> linkText([[NSAttributedString alloc]
@@ skipping 10 matching lines @@
       in downloadItemControllers_.get()) {
     [[NSNotificationCenter defaultCenter] removeObserver:itemController];
   }
   [super dealloc];
 }
 
 - (void)resizeDownloadLinkToFit {
   // Get width required by localized download link text.
   // http://developer.apple.com/documentation/Cocoa/Conceptual/TextLayout/Tasks/StringHeight.html
   [[showAllDownloadsLink_ textContainer] setLineFragmentPadding:0.0];
-  (void)[[showAllDownloadsLink_ layoutManager]glyphRangeForTextContainer:
+  (void)[[showAllDownloadsLink_ layoutManager] glyphRangeForTextContainer:
       [showAllDownloadsLink_ textContainer]];
   NSRect textRect = [[showAllDownloadsLink_ layoutManager]
       usedRectForTextContainer:[showAllDownloadsLink_ textContainer]];
 
   int offsetX = [showAllDownloadsLink_ frame].size.width - textRect.size.width;
 
   // Fit link itself.
   NSRect linkFrame = [linkContainer_ frame];
   linkFrame.origin.x += offsetX;
   linkFrame.size.width -= offsetX;
@@ skipping 22 matching lines @@
 
 - (void)remove:(DownloadItemController*)download {
   // Look for the download in our controller array and remove it. This will
   // explicity release it so that it removes itself as an Observer of the
   // DownloadItem. We don't want to wait for autorelease since the DownloadItem
   // we are observing will likely be gone by then.
   [[NSNotificationCenter defaultCenter] removeObserver:download];
   [[download view] removeFromSuperview];
   [downloadItemControllers_ removeObject:download];
 
-  // TODO(thakis): Need to relayout the remaining item views here (
-  // crbug.com/17831 ).
+  [self layoutItems];
 
   // Check to see if we have any downloads remaining and if not, hide the shelf.
   if (![downloadItemControllers_ count])
     [self showDownloadShelf:NO];
 }
 
 // We need to explicitly release our download controllers here since they need
 // to remove themselves as observers before the remaining shutdown happens.
 - (void)exiting {
   downloadItemControllers_.reset();
@@ skipping 29 matching lines @@
   if (sender)
     bridge_->Close();
   else
     [self showDownloadShelf:NO];
 }
 
 - (float)height {
   return shelfHeight_;
 }
 
-- (void)addDownloadItem:(BaseDownloadItemModel*)model {
-  // TODO(thakis): RTL support?
-  // (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
-  // Shift all existing items to the right
+// If |skipFirst| is true, the frame of the leftmost item is not set.
+- (void)layoutItems:(BOOL)skipFirst {
+  CGFloat currentX = 0;
   for (DownloadItemController* itemController
       in downloadItemControllers_.get()) {
     NSRect frame = [[itemController view] frame];
-    frame.origin.x += kDownloadItemWidth + kDownloadItemPadding;
-    [[[itemController view] animator] setFrame:frame];
+    frame.origin.x = currentX;
+    frame.size.width = [itemController preferredSize].width;
+    if (!skipFirst)
+      [[[itemController view] animator] setFrame:frame];
+    currentX += frame.size.width + kDownloadItemPadding;
+    skipFirst = NO;
   }
+}
 
+- (void)layoutItems {
+  [self layoutItems:NO];
+}
+
+- (void)addDownloadItem:(BaseDownloadItemModel*)model {
   // Insert new item at the left.
-  // Start at width 0...
-  NSRect position = NSMakeRect(0, kDownloadItemBorderPadding,
-                               0, kDownloadItemHeight);
   scoped_nsobject<DownloadItemController> controller(
-      [[DownloadItemController alloc] initWithFrame:position
-                                              model:model
-                                              shelf:self]);
-  [downloadItemControllers_ addObject:controller.get()];
+      [[DownloadItemController alloc] initWithModel:model shelf:self]);
+
+  // Adding at index 0 in NSMutableArrays is O(1).
+  [downloadItemControllers_ insertObject:controller.get() atIndex:0];
 
   [itemContainerView_ addSubview:[controller.get() view]];
 
   [[NSNotificationCenter defaultCenter]
     addObserver:controller
        selector:@selector(updateVisibility:)
            name:NSViewFrameDidChangeNotification
          object:[controller view]];
   [[NSNotificationCenter defaultCenter]
     addObserver:controller
        selector:@selector(updateVisibility:)
            name:NSViewFrameDidChangeNotification
          object:itemContainerView_];
 
+  // Start at width 0...
+  NSSize size = [controller.get() preferredSize];
+  NSRect frame = NSMakeRect(0, kDownloadItemBorderPadding, 0, size.height);
+  [[controller.get() view] setFrame:frame];
+
   // ...then animate in
-  NSRect frame = [[controller.get() view] frame];
-  frame.size.width = kDownloadItemWidth;
-
+  frame.size.width = size.width;
   [NSAnimationContext beginGrouping];
   [[NSAnimationContext currentContext] setDuration:kDownloadItemOpenDuration];
   [[[controller.get() view] animator] setFrame:frame];
   [NSAnimationContext endGrouping];
 
   // Keep only a limited number of items in the shelf.
   if ([downloadItemControllers_ count] > kMaxDownloadItemCount) {
     DCHECK(kMaxDownloadItemCount > 0);
 
     // Since no user will ever see the item being removed (needs a horizontal
     // screen resolution greater than 3200 at 16 items at 200 pixels each),
     // there's no point in animating the removal.
-    [self remove:[downloadItemControllers_ objectAtIndex:0]];
+    [self remove:[downloadItemControllers_ lastObject]];
   }
+
+  // Finally, move the remaining items to the right. Skip the first item when
+  // laying out the items, so that the longer animation duration we set up above
+  // is not overwritten.
+  [self layoutItems:YES];
 }
 
 @end