Added download error descriptions to tooltips for Mac & Linux.

chrome/browser/ui/cocoa/download/download_item_controller.mm

 // 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 "chrome/browser/ui/cocoa/download/download_item_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/string16.h"
@@ skipping 26 matching lines @@
 namespace {
 
 // NOTE: Mac currently doesn't use this like Windows does.  Mac uses this to
 // control the min size on the dangerous download text.  TVL sent a query off to
 // UX to fully spec all the the behaviors of download items and truncations
 // rules so all platforms can get inline in the future.
 const int kTextWidth = 140;            // Pixels
 
 // The maximum width in pixels for the file name tooltip.
 const int kToolTipMaxWidth = 900;
+const int kToolTipErrorMessageMaxHeight = kToolTipMaxWidth / 4;
 
 
 // Helper to widen a view.
 void WidenView(NSView* view, CGFloat widthChange) {
   // If it is an NSBox, the autoresize of the contentView is the issue.
   NSView* contentView = view;
   if ([view isKindOfClass:[NSBox class]]) {
     contentView = [(NSBox*)view contentView];
   }
   BOOL autoresizesSubviews = [contentView autoresizesSubviews];
@@ skipping 181 matching lines @@
     return [progressView_ frame].size;
   DCHECK_EQ(kDangerous, state_);
   return [dangerousDownloadView_ frame].size;
 }
 
 - (DownloadItem*)download {
   return bridge_->download_model()->download();
 }
 
 - (void)updateToolTip {
-  string16 elidedFilename = ui::ElideFilename(
+  string16 tooltip_text = ui::ElideFilename(
       [self download]->GetFileNameToReportUser(), *font_, kToolTipMaxWidth);
-  [progressView_ setToolTip:base::SysUTF16ToNSString(elidedFilename)];
+
+  if ([self download]->GetState() == content::DownloadItem::INTERRUPTED) {
+    content::DownloadInterruptReason reason = [self download]->GetLastReason();
+    DCHECK(reason != 0);
+
+    // Split up the error description string as necessary.
+    std::vector<string16> elidedMessages;
+    ui::ElideRectangleText(
+        DownloadItemModel::InterruptReasonMessage(reason),
+        *font_,
+        kToolTipMaxWidth,
+        kToolTipErrorMessageMaxHeight,
+        ui::IGNORE_LONG_WORDS,
+        &elidedMessages);
+
+    string16 new_line = ASCIIToUTF16("\n");
+    tooltip_text += new_line;
+
+    for (size_t i = 0; i < elidedMessages.size(); ++i) {
+      tooltip_text += elidedMessages[i];
+      tooltip_text += new_line;
+    }
+
+    tooltip_text += bridge_->download_model()->GetProgressText();
+  }
+
+  [progressView_ setToolTip:base::SysUTF16ToNSString(tooltip_text)];
 }
 
 - (void)clearDangerousMode {
   [self setState:kNormal];
   // The state change hide the dangerouse download view and is now showing the
   // download progress view.  This means the view is likely to be a different
   // size, so trigger a shelf layout to fix up spacing.
   [shelf_ layoutItems];
 }
 
@@ skipping 106 matching lines @@
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_PAUSE_ITEM)];
   } else {
     [sender setTitle:l10n_util::GetNSStringWithFixup(
         IDS_DOWNLOAD_MENU_RESUME_ITEM)];
   }
   menuBridge_->ExecuteCommand(DownloadShelfContextMenuMac::TOGGLE_PAUSE);
 }
 
 @end