Reorganize code; no functional change.

* AnimateStateTransition() is never called; remove.
* OpenDownload(), Reenable(), DrawIcon(), UpdateColorsFromTheme(),
  GetErrorIconSize(), and ReleaseDropdown() are only referenced in one
  function apiece.  Inline them into their callers, which in many
  cases will provide future refactoring opportunities.  In a couple of
  cases (OnPaint() and ButtonPressed()) the callers are unwieldy as a
  result; these will be refactored in an upcoming CL.
* Reorder a few other functions to try and group related functions
  together more.
* Improve .h comments slightly.

Bug: none
Change-Id: Ic6801d70b3dadd1c696ee0d97fb8daf5b23f85c3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2303863
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789611}

chrome/browser/ui/views/download/download_item_view.cc

@@ -449,6 +449,8 @@ void DownloadItemView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
 
 void DownloadItemView::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
+  // TODO(pkasting): Refactor to simplify.
+
   if (sender == open_now_button_) {
     OpenDownloadDuringAsyncScanning();
     return;
@@ -506,7 +508,18 @@ void DownloadItemView::ButtonPressed(views::Button* sender,
     if (has_warning_label(mode_))
       return;
     complete_animation_.End();
-    OpenDownload();
+
+    // We're interested in how long it takes users to open downloads.  If they
+    // open downloads super quickly, we should be concerned about clickjacking.
+    UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
+                             base::Time::Now() - creation_time_);
+
+    // If this is still around for the next status update, it will be read.
+    announce_accessible_alert_soon_ = true;
+
+    // Calling download()->OpenDownload may delete this, so this must be
+    // the last thing we do.
+    model_->OpenDownload();
     return;
   }
 
@@ -575,10 +588,17 @@ void DownloadItemView::OnDownloadOpened() {
       l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING, filename_string));
 
   SetEnabled(false);
+  const auto reenable = [](base::WeakPtr<DownloadItemView> view) {
+    if (!view)
+      return;
+    auto* label = view->file_name_label_;
+    label->SetTextStyle(views::style::STYLE_PRIMARY);
+    label->SetText(view->ElidedFilename());
+    view->SetEnabled(true);
+  };
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE,
-      base::BindOnce(&DownloadItemView::Reenable,
-                     weak_ptr_factory_.GetWeakPtr()),
+      base::BindOnce(std::move(reenable), weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromSeconds(3));
 
   // Notify our parent.
@@ -669,15 +689,106 @@ void DownloadItemView::OnPaintBackground(gfx::Canvas* canvas) {
 }
 
 void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
+  // TODO(pkasting): Refactor to simplify.
+
   OnPaintBackground(canvas);
 
-  DrawIcon(canvas);
+  bool use_new_warnings =
+      base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings);
+  bool show_warning_icon = mode_ != Mode::kNormal;
+  if (show_warning_icon && !use_new_warnings) {
+    int icon_x =
+        (base::i18n::IsRTL() ? width() - GetWarningIconSize() - kStartPadding
+                             : kStartPadding);
+    int icon_y = (height() - GetWarningIconSize()) / 2;
+    canvas->DrawImageInt(GetWarningIcon(), icon_x, icon_y);
+
+    OnPaintBorder(canvas);
+    return;
+  }
+
+  // Paint download progress.
+  DownloadItem::DownloadState state = model_->GetState();
+  int progress_x = base::i18n::IsRTL()
+                       ? width() - kStartPadding - kProgressIndicatorSize
+                       : kStartPadding;
+  int progress_y = (height() - kProgressIndicatorSize) / 2;
+  const gfx::RectF progress_bounds(
+      progress_x, progress_y, kProgressIndicatorSize, kProgressIndicatorSize);
+
+  const gfx::ImageSkia* current_icon = nullptr;
+  IconManager* im = g_browser_process->icon_manager();
+  gfx::Image* image_ptr = im->LookupIconFromFilepath(
+      model_->GetTargetFilePath(), IconLoader::SMALL);
+  if (image_ptr)
+    current_icon = image_ptr->ToImageSkia();
+
+  if (state == DownloadItem::IN_PROGRESS &&
+      !(use_new_warnings && show_warning_icon)) {
+    base::TimeDelta indeterminate_progress_time =
+        indeterminate_progress_time_elapsed_;
+    if (!model_->IsPaused()) {
+      indeterminate_progress_time +=
+          base::TimeTicks::Now() - indeterminate_progress_start_time_;
+    }
+    PaintDownloadProgress(canvas, progress_bounds, indeterminate_progress_time,
+                          model_->PercentComplete());
+  } else if (complete_animation_.is_animating()) {
+    DCHECK_EQ(Mode::kNormal, mode_);
+    // Loop back and forth five times.
+    double start = 0, end = 5;
+    if (model_->GetState() == download::DownloadItem::INTERRUPTED)
+      std::swap(start, end);
+    const double value = gfx::Tween::DoubleValueBetween(
+        complete_animation_.GetCurrentValue(), start, end);
+    const double opacity = std::sin((value + 0.5) * base::kPiDouble) / 2 + 0.5;
+    canvas->SaveLayerAlpha(
+        static_cast<uint8_t>(gfx::Tween::IntValueBetween(opacity, 0, 255)));
+    PaintDownloadProgress(canvas, progress_bounds, base::TimeDelta(), 100);
+    canvas->Restore();
+  } else if (use_new_warnings) {
+    current_icon = &file_icon_;
+  }
+
+  if (current_icon) {
+    // Draw the icon image.
+    int kFiletypeIconOffset =
+        (kProgressIndicatorSize - current_icon->height()) / 2;
+    int icon_x = progress_x + kFiletypeIconOffset;
+    int icon_y = progress_y + kFiletypeIconOffset;
+    cc::PaintFlags flags;
+    // Use an alpha to make the image look disabled.
+    if (!GetEnabled())
+      flags.setAlpha(120);
+    canvas->DrawImageInt(*current_icon, icon_x, icon_y, flags);
+
+    // Overlay the danger icon if appropriate.
+    if (show_warning_icon && use_new_warnings) {
+      int icon_x =
+          (base::i18n::IsRTL() ? width() - GetWarningIconSize() - kStartPadding
+                               : kStartPadding) +
+          kDangerIconOffset;
+      int icon_y = (height() - GetWarningIconSize()) / 2 + kDangerIconOffset;
+      canvas->DrawImageInt(GetWarningIcon(), icon_x, icon_y);
+    }
+  }
+
   OnPaintBorder(canvas);
 }
 
 void DownloadItemView::OnThemeChanged() {
   views::View::OnThemeChanged();
-  UpdateColorsFromTheme();
+
+  SkColor background_color =
+      GetThemeProvider()->GetColor(ThemeProperties::COLOR_DOWNLOAD_SHELF);
+  file_name_label_->SetBackgroundColor(background_color);
+  status_label_->SetBackgroundColor(background_color);
+
+  shelf_->ConfigureButtonForTheme(open_now_button_);
+  shelf_->ConfigureButtonForTheme(save_button_);
+  shelf_->ConfigureButtonForTheme(discard_button_);
+  shelf_->ConfigureButtonForTheme(scan_button_);
+
   SchedulePaint();
   UpdateDropdownButton();
 }
@@ -882,188 +993,133 @@ void DownloadItemView::UpdateAccessibleAlertAndTimersForNormalMode() {
   }
 }
 
-void DownloadItemView::OpenDownload() {
-  DCHECK(!is_download_warning(mode_));
-  // We're interested in how long it takes users to open downloads.  If they
-  // open downloads super quickly, we should be concerned about clickjacking.
-  UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
-                           base::Time::Now() - creation_time_);
-
-  // If this is still around for the next status update, it will be read.
-  announce_accessible_alert_soon_ = true;
-
-  // Calling download()->OpenDownload may delete this, so this must be
-  // the last thing we do.
-  model_->OpenDownload();
+void DownloadItemView::UpdateAccessibleAlert(
+    const base::string16& accessible_alert_text,
+    bool is_last_update) {
+  views::ViewAccessibility& ax = accessible_alert_->GetViewAccessibility();
+  ax.OverrideRole(ax::mojom::Role::kAlert);
+  ax.OverrideName(accessible_alert_text);
+  if (is_last_update) {
+    // Last update: stop the announcement interval timer and make the last
+    // announcement immediately.
+    accessible_alert_timer_.AbandonAndStop();
+    AnnounceAccessibleAlert();
+  } else if (!accessible_alert_timer_.IsRunning()) {
+    // First update: start the announcement interval timer and make the first
+    // announcement immediately.
+    accessible_alert_timer_.Start(FROM_HERE, kAccessibleAlertInterval, this,
+                                  &DownloadItemView::AnnounceAccessibleAlert);
+    AnnounceAccessibleAlert();
+  } else if (announce_accessible_alert_soon_) {
+    accessible_alert_timer_.Reset();
+    AnnounceAccessibleAlert();
+  }
 }
 
-bool DownloadItemView::SubmitDownloadToFeedbackService(
-    DownloadCommands::Command download_command) {
-#if BUILDFLAG(FULL_SAFE_BROWSING)
-  safe_browsing::SafeBrowsingService* sb_service =
-      g_browser_process->safe_browsing_service();
-  if (!sb_service)
-    return false;
-  safe_browsing::DownloadProtectionService* download_protection_service =
-      sb_service->download_protection_service();
-  if (!download_protection_service)
-    return false;
-  // TODO(shaktisahu): Enable feedback service for offline item.
-  if (model_->download()) {
-    return download_protection_service->MaybeBeginFeedbackForDownload(
-        shelf_->browser()->profile(), model_->download(), download_command);
+base::string16 DownloadItemView::GetInProgressAccessibleAlertText() {
+  // If opening when complete or there is a warning, use the full status text.
+  if (model_->GetOpenWhenComplete() || has_warning_label(mode_))
+    return accessible_name_;
+
+  // Prefer to announce the time remaining, if known.
+  base::TimeDelta remaining;
+  if (model_->TimeRemaining(&remaining)) {
+    // If complete, skip this round: a completion status update is coming soon.
+    if (remaining.is_zero())
+      return base::string16();
+    base::string16 remaining_string =
+        ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
+                               ui::TimeFormat::LENGTH_SHORT, remaining);
+    return l10n_util::GetStringFUTF16(
+        IDS_DOWNLOAD_STATUS_TIME_REMAINING_ACCESSIBLE_ALERT, remaining_string);
   }
-  // WARNING: we are deleted at this point.  Don't access 'this'.
-  return true;
-#else
-  NOTREACHED();
-  return false;
-#endif
-}
 
-void DownloadItemView::DrawIcon(gfx::Canvas* canvas) {
-  bool use_new_warnings =
-      base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings);
-  bool show_warning_icon = mode_ != Mode::kNormal;
-  if (show_warning_icon && !use_new_warnings) {
-    int icon_x =
-        (base::i18n::IsRTL() ? width() - GetWarningIconSize() - kStartPadding
-                             : kStartPadding);
-    int icon_y = (height() - GetWarningIconSize()) / 2;
-    canvas->DrawImageInt(GetWarningIcon(), icon_x, icon_y);
-    return;
+  // Time remaining is unknown, try to announce percent remaining.
+  if (model_->PercentComplete() > 0) {
+    DCHECK_LE(model_->PercentComplete(), 100);
+    return l10n_util::GetStringFUTF16Int(
+        IDS_DOWNLOAD_STATUS_PERCENT_COMPLETE_ACCESSIBLE_ALERT,
+        100 - model_->PercentComplete());
   }
 
-  // Paint download progress.
-  DownloadItem::DownloadState state = model_->GetState();
-  int progress_x = base::i18n::IsRTL()
-                       ? width() - kStartPadding - kProgressIndicatorSize
-                       : kStartPadding;
-  int progress_y = (height() - kProgressIndicatorSize) / 2;
-  const gfx::RectF progress_bounds(
-      progress_x, progress_y, kProgressIndicatorSize, kProgressIndicatorSize);
+  // Percent remaining is also unknown, announce bytes to download.
+  base::string16 file_name =
+      model_->GetFileNameToReportUser().LossyDisplayName();
+  return l10n_util::GetStringFUTF16(
+      IDS_DOWNLOAD_STATUS_IN_PROGRESS_ACCESSIBLE_ALERT,
+      ui::FormatBytes(model_->GetTotalBytes()), file_name);
+}
 
-  const gfx::ImageSkia* current_icon = nullptr;
-  IconManager* im = g_browser_process->icon_manager();
-  gfx::Image* image_ptr = im->LookupIconFromFilepath(
-      model_->GetTargetFilePath(), IconLoader::SMALL);
-  if (image_ptr)
-    current_icon = image_ptr->ToImageSkia();
+void DownloadItemView::AnnounceAccessibleAlert() {
+  accessible_alert_->NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true);
+  announce_accessible_alert_soon_ = false;
+}
 
-  if (state == DownloadItem::IN_PROGRESS &&
-      !(use_new_warnings && show_warning_icon)) {
-    base::TimeDelta indeterminate_progress_time =
-        indeterminate_progress_time_elapsed_;
-    if (!model_->IsPaused()) {
-      indeterminate_progress_time +=
-          base::TimeTicks::Now() - indeterminate_progress_start_time_;
+void DownloadItemView::OnFileIconLoaded(IconLoader::IconSize icon_size,
+                                        gfx::Image icon_bitmap) {
+  if (!icon_bitmap.IsEmpty()) {
+    if (icon_size == IconLoader::NORMAL) {
+      // We want a 24x24 icon, but on Windows only 16x16 and 32x32 are
+      // available. So take the NORMAL icon and downsize it.
+      constexpr gfx::Size kFileIconSize(24, 24);
+      file_icon_ = gfx::ImageSkiaOperations::CreateResizedImage(
+          *icon_bitmap.ToImageSkia(), skia::ImageOperations::RESIZE_BEST,
+          kFileIconSize);
     }
-    PaintDownloadProgress(canvas, progress_bounds, indeterminate_progress_time,
-                          model_->PercentComplete());
-  } else if (complete_animation_.is_animating()) {
-    DCHECK_EQ(Mode::kNormal, mode_);
-    // Loop back and forth five times.
-    double start = 0, end = 5;
-    if (model_->GetState() == download::DownloadItem::INTERRUPTED)
-      std::swap(start, end);
-    const double value = gfx::Tween::DoubleValueBetween(
-        complete_animation_.GetCurrentValue(), start, end);
-    const double opacity = std::sin((value + 0.5) * base::kPiDouble) / 2 + 0.5;
-    canvas->SaveLayerAlpha(
-        static_cast<uint8_t>(gfx::Tween::IntValueBetween(opacity, 0, 255)));
-    PaintDownloadProgress(canvas, progress_bounds, base::TimeDelta(), 100);
-    canvas->Restore();
-  } else if (use_new_warnings) {
-    current_icon = &file_icon_;
+    SchedulePaint();
   }
+}
 
-  if (!current_icon)
-    return;
-
-  // Draw the icon image.
-  int kFiletypeIconOffset =
-      (kProgressIndicatorSize - current_icon->height()) / 2;
-  int icon_x = progress_x + kFiletypeIconOffset;
-  int icon_y = progress_y + kFiletypeIconOffset;
-  cc::PaintFlags flags;
-  // Use an alpha to make the image look disabled.
-  if (!GetEnabled())
-    flags.setAlpha(120);
-  canvas->DrawImageInt(*current_icon, icon_x, icon_y, flags);
-
-  // Overlay the danger icon if appropriate.
-  if (show_warning_icon && use_new_warnings) {
-    int icon_x =
-        (base::i18n::IsRTL() ? width() - GetWarningIconSize() - kStartPadding
-                             : kStartPadding) +
-        kDangerIconOffset;
-    int icon_y = (height() - GetWarningIconSize()) / 2 + kDangerIconOffset;
-    canvas->DrawImageInt(GetWarningIcon(), icon_x, icon_y);
-  }
-}
-
-void DownloadItemView::UpdateColorsFromTheme() {
-  if (!GetThemeProvider())
-    return;
-
-  SkColor background_color =
-      GetThemeProvider()->GetColor(ThemeProperties::COLOR_DOWNLOAD_SHELF);
-  file_name_label_->SetBackgroundColor(background_color);
-  status_label_->SetBackgroundColor(background_color);
-
-  shelf_->ConfigureButtonForTheme(open_now_button_);
-  shelf_->ConfigureButtonForTheme(save_button_);
-  shelf_->ConfigureButtonForTheme(discard_button_);
-  shelf_->ConfigureButtonForTheme(scan_button_);
-}
-
-void DownloadItemView::UpdateDropdownButton() {
-  views::SetImageFromVectorIcon(
-      dropdown_button_,
-      dropdown_state_ == PUSHED ? kCaretDownIcon : kCaretUpIcon,
-      GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
-}
-
-void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
-                                           ui::MenuSourceType source_type) {
-  // Similar hack as in MenuButton.
-  // We're about to show the menu from a mouse press. By showing from the
-  // mouse press event we block RootView in mouse dispatching. This also
-  // appears to cause RootView to get a mouse pressed BEFORE the mouse
-  // release is seen, which means RootView sends us another mouse press no
-  // matter where the user pressed. To force RootView to recalculate the
-  // mouse target during the mouse press we explicitly set the mouse handler
-  // to null.
-  static_cast<views::internal::RootView*>(GetWidget()->GetRootView())
-      ->SetMouseHandler(nullptr);
+void DownloadItemView::PaintDownloadProgress(
+    gfx::Canvas* canvas,
+    const gfx::RectF& bounds,
+    const base::TimeDelta& indeterminate_progress_time,
+    int percent_done) const {
+  const SkColor color = GetThemeProvider()->GetColor(
+      ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
 
-  if (!context_menu_.get())
-    context_menu_ = std::make_unique<DownloadShelfContextMenuView>(this);
-  context_menu_->Run(GetWidget()->GetTopLevelWidget(), rect, source_type,
-                     base::Bind(&DownloadItemView::ReleaseDropdown,
-                                weak_ptr_factory_.GetWeakPtr()));
-}
+  // Draw background.
+  cc::PaintFlags bg_flags;
+  bg_flags.setColor(SkColorSetA(color, 0x33));
+  bg_flags.setStyle(cc::PaintFlags::kFill_Style);
+  bg_flags.setAntiAlias(true);
+  canvas->DrawCircle(bounds.CenterPoint(), bounds.width() / 2, bg_flags);
 
-void DownloadItemView::SetDropdownState(State new_state) {
-  if (new_state != dropdown_state_) {
-    dropdown_button_->AnimateInkDrop(new_state == PUSHED
-                                         ? views::InkDropState::ACTIVATED
-                                         : views::InkDropState::DEACTIVATED,
-                                     nullptr);
-    dropdown_state_ = new_state;
-    UpdateDropdownButton();
-    SchedulePaint();
+  // Calculate progress.
+  SkScalar start_pos = SkIntToScalar(270);  // 12 o'clock
+  SkScalar sweep_angle = SkDoubleToScalar(360 * percent_done / 100.0);
+  if (percent_done < 0) {
+    // Download size unknown.  Draw a 50 degree sweep that moves at 80 degrees
+    // per second.
+    start_pos +=
+        SkDoubleToScalar(indeterminate_progress_time.InSecondsF() * 80);
+    sweep_angle = SkIntToScalar(50);
   }
+
+  // Draw progress.
+  SkPath progress;
+  progress.addArc(gfx::RectFToSkRect(bounds), start_pos, sweep_angle);
+  cc::PaintFlags progress_flags;
+  progress_flags.setColor(color);
+  progress_flags.setStyle(cc::PaintFlags::kStroke_Style);
+  progress_flags.setStrokeWidth(1.7f);
+  progress_flags.setAntiAlias(true);
+  canvas->DrawPath(progress, progress_flags);
 }
 
 gfx::ImageSkia DownloadItemView::GetWarningIcon() {
+  // TODO(drubery): Replace this with a constexpr variable when the new UX is
+  // fully launched.
+  const int error_icon_size =
+      base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings) ? 20
+                                                                           : 27;
   switch (model_->GetDangerType()) {
     case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
       if (safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
               model()->profile())
               ->IsUnderAdvancedProtection()) {
         return gfx::CreateVectorIcon(
-            vector_icons::kErrorIcon, GetErrorIconSize(),
+            vector_icons::kErrorIcon, error_icon_size,
             GetNativeTheme()->GetSystemColor(
                 ui::NativeTheme::kColorId_AlertSeverityMedium));
       }
@@ -1085,13 +1141,13 @@ gfx::ImageSkia DownloadItemView::GetWarningIcon() {
     case download::DOWNLOAD_DANGER_TYPE_ASYNC_SCANNING:
     case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_WARNING:
       return gfx::CreateVectorIcon(
-          vector_icons::kErrorIcon, GetErrorIconSize(),
+          vector_icons::kErrorIcon, error_icon_size,
           GetNativeTheme()->GetSystemColor(
               ui::NativeTheme::kColorId_DefaultIconColor));
 
     case download::DOWNLOAD_DANGER_TYPE_PROMPT_FOR_SCANNING:
       return gfx::CreateVectorIcon(
-          vector_icons::kHelpIcon, GetErrorIconSize(),
+          vector_icons::kHelpIcon, error_icon_size,
           GetNativeTheme()->GetSystemColor(
               ui::NativeTheme::kColorId_DefaultIconColor));
 
@@ -1114,7 +1170,7 @@ gfx::ImageSkia DownloadItemView::GetWarningIcon() {
               ui::NativeTheme::kColorId_AlertSeverityHigh));
     case download::DownloadItem::MixedContentStatus::WARN:
       return gfx::CreateVectorIcon(
-          vector_icons::kErrorIcon, GetErrorIconSize(),
+          vector_icons::kErrorIcon, error_icon_size,
           GetNativeTheme()->GetSystemColor(
               ui::NativeTheme::kColorId_AlertSeverityMedium));
     case download::DownloadItem::MixedContentStatus::UNKNOWN:
@@ -1128,6 +1184,31 @@ gfx::ImageSkia DownloadItemView::GetWarningIcon() {
   return gfx::ImageSkia();
 }
 
+std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const {
+  using DangerType = download::DownloadDangerType;
+  const auto type = model_->GetDangerType();
+  if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_SAFE) {
+    return {l10n_util::GetStringUTF16(IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_SAFE),
+            STYLE_GREEN};
+  }
+  constexpr int kDangerous = IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_OPENED_DANGEROUS;
+  if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS)
+    return {l10n_util::GetStringUTF16(kDangerous), STYLE_RED};
+
+  const GURL url = model_->GetOriginalURL().GetOrigin();
+  const base::string16 text =
+      (!model_->ShouldPromoteOrigin() || url.is_empty())
+          ? model_->GetStatusText()
+#if defined(OS_ANDROID)
+          // url_formatter::ElideUrl() doesn't exist on Android.
+          : base::string16();
+#else
+          : url_formatter::ElideUrl(url, status_label_->font_list(),
+                                    kTextWidth);
+#endif
+  return {text, views::style::STYLE_PRIMARY};
+}
+
 gfx::Size DownloadItemView::GetButtonSize() const {
   gfx::Size size;
   if (discard_button_->GetVisible())
@@ -1139,6 +1220,11 @@ gfx::Size DownloadItemView::GetButtonSize() const {
   return size;
 }
 
+base::string16 DownloadItemView::ElidedFilename() {
+  return gfx::ElideFilename(model_->GetFileNameToReportUser(), font_list_,
+                            kTextWidth);
+}
+
 int DownloadItemView::GetLabelWidth(const views::StyledLabel& label) const {
   auto lines_for_width = [&label](int width) {
     return label.GetLayoutSizeInfoForWidth(width).line_sizes.size();
@@ -1162,177 +1248,77 @@ int DownloadItemView::GetLabelWidth(const views::StyledLabel& label) const {
                                     std::move(lines_for_width));
 }
 
-void DownloadItemView::Reenable() {
-  file_name_label_->SetTextStyle(views::style::STYLE_PRIMARY);
-  file_name_label_->SetText(ElidedFilename());
-  SetEnabled(true);  // Triggers a repaint.
-}
-
-void DownloadItemView::ReleaseDropdown() {
-  SetDropdownState(NORMAL);
-  // Make sure any new status from activating a context menu option is read.
-  announce_accessible_alert_soon_ = true;
-}
-
-void DownloadItemView::UpdateAccessibleAlert(
-    const base::string16& accessible_alert_text,
-    bool is_last_update) {
-  views::ViewAccessibility& ax = accessible_alert_->GetViewAccessibility();
-  ax.OverrideRole(ax::mojom::Role::kAlert);
-  ax.OverrideName(accessible_alert_text);
-  if (is_last_update) {
-    // Last update: stop the announcement interval timer and make the last
-    // announcement immediately.
-    accessible_alert_timer_.AbandonAndStop();
-    AnnounceAccessibleAlert();
-  } else if (!accessible_alert_timer_.IsRunning()) {
-    // First update: start the announcement interval timer and make the first
-    // announcement immediately.
-    accessible_alert_timer_.Start(FROM_HERE, kAccessibleAlertInterval, this,
-                                  &DownloadItemView::AnnounceAccessibleAlert);
-    AnnounceAccessibleAlert();
-  } else if (announce_accessible_alert_soon_) {
-    accessible_alert_timer_.Reset();
-    AnnounceAccessibleAlert();
-  }
-}
-
-base::string16 DownloadItemView::GetInProgressAccessibleAlertText() {
-  // If opening when complete or there is a warning, use the full status text.
-  if (model_->GetOpenWhenComplete() || has_warning_label(mode_))
-    return accessible_name_;
-
-  // Prefer to announce the time remaining, if known.
-  base::TimeDelta remaining;
-  if (model_->TimeRemaining(&remaining)) {
-    // If complete, skip this round: a completion status update is coming soon.
-    if (remaining.is_zero())
-      return base::string16();
-    base::string16 remaining_string =
-        ui::TimeFormat::Simple(ui::TimeFormat::FORMAT_REMAINING,
-                               ui::TimeFormat::LENGTH_SHORT, remaining);
-    return l10n_util::GetStringFUTF16(
-        IDS_DOWNLOAD_STATUS_TIME_REMAINING_ACCESSIBLE_ALERT, remaining_string);
-  }
-
-  // Time remaining is unknown, try to announce percent remaining.
-  if (model_->PercentComplete() > 0) {
-    DCHECK_LE(model_->PercentComplete(), 100);
-    return l10n_util::GetStringFUTF16Int(
-        IDS_DOWNLOAD_STATUS_PERCENT_COMPLETE_ACCESSIBLE_ALERT,
-        100 - model_->PercentComplete());
-  }
-
-  // Percent remaining is also unknown, announce bytes to download.
-  base::string16 file_name =
-      model_->GetFileNameToReportUser().LossyDisplayName();
-  return l10n_util::GetStringFUTF16(
-      IDS_DOWNLOAD_STATUS_IN_PROGRESS_ACCESSIBLE_ALERT,
-      ui::FormatBytes(model_->GetTotalBytes()), file_name);
-}
-
-void DownloadItemView::AnnounceAccessibleAlert() {
-  accessible_alert_->NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true);
-  announce_accessible_alert_soon_ = false;
-}
-
-void DownloadItemView::OnFileIconLoaded(IconLoader::IconSize icon_size,
-                                        gfx::Image icon_bitmap) {
-  if (!icon_bitmap.IsEmpty()) {
-    if (icon_size == IconLoader::NORMAL) {
-      // We want a 24x24 icon, but on Windows only 16x16 and 32x32 are
-      // available. So take the NORMAL icon and downsize it.
-      constexpr gfx::Size kFileIconSize(24, 24);
-      file_icon_ = gfx::ImageSkiaOperations::CreateResizedImage(
-          *icon_bitmap.ToImageSkia(), skia::ImageOperations::RESIZE_BEST,
-          kFileIconSize);
-    }
+void DownloadItemView::SetDropdownState(State new_state) {
+  if (new_state != dropdown_state_) {
+    dropdown_button_->AnimateInkDrop(new_state == PUSHED
+                                         ? views::InkDropState::ACTIVATED
+                                         : views::InkDropState::DEACTIVATED,
+                                     nullptr);
+    dropdown_state_ = new_state;
+    UpdateDropdownButton();
     SchedulePaint();
   }
 }
 
-void DownloadItemView::PaintDownloadProgress(
-    gfx::Canvas* canvas,
-    const gfx::RectF& bounds,
-    const base::TimeDelta& indeterminate_progress_time,
-    int percent_done) const {
-  const SkColor color = GetThemeProvider()->GetColor(
-      ThemeProperties::COLOR_TAB_THROBBER_SPINNING);
-
-  // Draw background.
-  cc::PaintFlags bg_flags;
-  bg_flags.setColor(SkColorSetA(color, 0x33));
-  bg_flags.setStyle(cc::PaintFlags::kFill_Style);
-  bg_flags.setAntiAlias(true);
-  canvas->DrawCircle(bounds.CenterPoint(), bounds.width() / 2, bg_flags);
+void DownloadItemView::UpdateDropdownButton() {
+  views::SetImageFromVectorIcon(
+      dropdown_button_,
+      dropdown_state_ == PUSHED ? kCaretDownIcon : kCaretUpIcon,
+      GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
+}
 
-  // Calculate progress.
-  SkScalar start_pos = SkIntToScalar(270);  // 12 o'clock
-  SkScalar sweep_angle = SkDoubleToScalar(360 * percent_done / 100.0);
-  if (percent_done < 0) {
-    // Download size unknown.  Draw a 50 degree sweep that moves at 80 degrees
-    // per second.
-    start_pos +=
-        SkDoubleToScalar(indeterminate_progress_time.InSecondsF() * 80);
-    sweep_angle = SkIntToScalar(50);
-  }
+void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
+                                           ui::MenuSourceType source_type) {
+  // Similar hack as in MenuButtonController.
+  // We're about to show the menu from a mouse press. By showing from the
+  // mouse press event we block RootView in mouse dispatching. This also
+  // appears to cause RootView to get a mouse pressed BEFORE the mouse
+  // release is seen, which means RootView sends us another mouse press no
+  // matter where the user pressed. To force RootView to recalculate the
+  // mouse target during the mouse press we explicitly set the mouse handler
+  // to null.
+  static_cast<views::internal::RootView*>(GetWidget()->GetRootView())
+      ->SetMouseHandler(nullptr);
 
-  // Draw progress.
-  SkPath progress;
-  progress.addArc(gfx::RectFToSkRect(bounds), start_pos, sweep_angle);
-  cc::PaintFlags progress_flags;
-  progress_flags.setColor(color);
-  progress_flags.setStyle(cc::PaintFlags::kStroke_Style);
-  progress_flags.setStrokeWidth(1.7f);
-  progress_flags.setAntiAlias(true);
-  canvas->DrawPath(progress, progress_flags);
+  if (!context_menu_.get())
+    context_menu_ = std::make_unique<DownloadShelfContextMenuView>(this);
+  const auto release_dropdown = [](DownloadItemView* view) {
+    view->SetDropdownState(NORMAL);
+    // Make sure any new status from activating a context menu option is read.
+    view->announce_accessible_alert_soon_ = true;
+  };
+  context_menu_->Run(
+      GetWidget()->GetTopLevelWidget(), rect, source_type,
+      base::BindRepeating(std::move(release_dropdown), base::Unretained(this)));
 }
 
-void DownloadItemView::AnimateStateTransition(State from,
-                                              State to,
-                                              gfx::SlideAnimation* animation) {
-  if (from == NORMAL && to == HOT) {
-    animation->Show();
-  } else if (from == HOT && to == NORMAL) {
-    animation->Hide();
-  } else if (from != to) {
-    animation->Reset((to == HOT) ? 1.0 : 0.0);
-  }
+void DownloadItemView::OpenDownloadDuringAsyncScanning() {
+  model_->CompleteSafeBrowsingScan();
+  model_->SetOpenWhenComplete(true);
 }
 
-std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const {
-  using DangerType = download::DownloadDangerType;
-  const auto type = model_->GetDangerType();
-  if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_SAFE) {
-    return {l10n_util::GetStringUTF16(IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_SAFE),
-            STYLE_GREEN};
+bool DownloadItemView::SubmitDownloadToFeedbackService(
+    DownloadCommands::Command download_command) {
+#if BUILDFLAG(FULL_SAFE_BROWSING)
+  safe_browsing::SafeBrowsingService* sb_service =
+      g_browser_process->safe_browsing_service();
+  if (!sb_service)
+    return false;
+  safe_browsing::DownloadProtectionService* download_protection_service =
+      sb_service->download_protection_service();
+  if (!download_protection_service)
+    return false;
+  // TODO(shaktisahu): Enable feedback service for offline item.
+  if (model_->download()) {
+    return download_protection_service->MaybeBeginFeedbackForDownload(
+        shelf_->browser()->profile(), model_->download(), download_command);
   }
-  constexpr int kDangerous = IDS_PROMPT_DOWNLOAD_DEEP_SCANNED_OPENED_DANGEROUS;
-  if (type == DangerType::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS)
-    return {l10n_util::GetStringUTF16(kDangerous), STYLE_RED};
-
-  const GURL url = model_->GetOriginalURL().GetOrigin();
-  const base::string16 text =
-      (!model_->ShouldPromoteOrigin() || url.is_empty())
-          ? model_->GetStatusText()
-#if defined(OS_ANDROID)
-          // url_formatter::ElideUrl() doesn't exist on Android.
-          : base::string16();
+  // WARNING: we are deleted at this point.  Don't access 'this'.
+  return true;
 #else
-          : url_formatter::ElideUrl(url, status_label_->font_list(),
-                                    kTextWidth);
+  NOTREACHED();
+  return false;
 #endif
-  return {text, views::style::STYLE_PRIMARY};
-}
-
-base::string16 DownloadItemView::ElidedFilename() {
-  return gfx::ElideFilename(model_->GetFileNameToReportUser(), font_list_,
-                            kTextWidth);
-}
-
-void DownloadItemView::OpenDownloadDuringAsyncScanning() {
-  model_->CompleteSafeBrowsingScan();
-  model_->SetOpenWhenComplete(true);
 }
 
 // static
@@ -1344,15 +1330,6 @@ int DownloadItemView::GetWarningIconSize() {
              : 24;
 }
 
-// static
-int DownloadItemView::GetErrorIconSize() {
-  // TODO(drubery): Replace this method with a constexpr variable when the new
-  // UX is fully launched.
-  return base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)
-             ? 20
-             : 27;
-}
-
 void DownloadItemView::ConfirmDeepScanning() {
   DownloadCommands(model_.get()).ExecuteCommand(DownloadCommands::DEEP_SCAN);
 }

chrome/browser/ui/views/download/download_item_view.h

@@ -148,49 +148,6 @@ class DownloadItemView : public views::View,
   // Updates the accessible alert and timers for normal mode.
   void UpdateAccessibleAlertAndTimersForNormalMode();
 
-  void OpenDownload();
-
-  // Submits the downloaded file to the safebrowsing download feedback service.
-  // Returns whether submission was successful. Applies |download_command|, if
-  // submission fails.
-  bool SubmitDownloadToFeedbackService(
-      DownloadCommands::Command download_command);
-
-  void DrawIcon(gfx::Canvas* canvas);
-
-  // Update the button colors based on the current theme.
-  void UpdateColorsFromTheme();
-
-  void UpdateDropdownButton();
-
-  // Shows the context menu at the specified location. |point| is in the view's
-  // coordinate system.
-  void ShowContextMenuImpl(const gfx::Rect& rect,
-                           ui::MenuSourceType source_type);
-
-  // Sets the state and triggers a repaint.
-  void SetDropdownState(State new_state);
-
-  // Returns the current warning icon (should only be called when the view is
-  // actually showing a warning).
-  gfx::ImageSkia GetWarningIcon();
-
-  // Sets |size| with the size of the Save and Discard buttons (they have the
-  // same size).
-  gfx::Size GetButtonSize() const;
-
-  // Returns either:
-  //   * 200, if |label| can fit in one line given at most 200 DIP width.
-  //   * The minimum width needed to display |label| on two lines.
-  int GetLabelWidth(const views::StyledLabel& label) const;
-
-  // Reenables the item after it has been disabled when a user clicked it to
-  // open the downloaded file.
-  void Reenable();
-
-  // Releases drop down button after showing a context menu.
-  void ReleaseDropdown();
-
   // Update accessible status text.
   // If |is_last_update| is false, then a timer is used to notify screen readers
   // to speak the alert text on a regular interval. If |is_last_update| is true,
@@ -217,28 +174,48 @@ class DownloadItemView : public views::View,
                              const base::TimeDelta& indeterminate_progress_time,
                              int percent_done) const;
 
-  // Show/Hide/Reset |animation| based on the state transition specified by
-  // |from| and |to|.
-  void AnimateStateTransition(State from,
-                              State to,
-                              gfx::SlideAnimation* animation);
+  // When not in normal mode, returns the current help/warning/error icon.
+  gfx::ImageSkia GetWarningIcon();
 
   // Returns the text and style to use for the status label.
   std::pair<base::string16, int> GetStatusTextAndStyle() const;
 
+  // Returns the size of any button visible next to the label (all visible
+  // buttons are given the same size).
+  gfx::Size GetButtonSize() const;
+
   // Returns the file name to report to user. It might be elided to fit into
   // the text width.
   base::string16 ElidedFilename();
 
+  // Returns either:
+  //   * 200, if |label| can fit in one line given at most 200 DIP width.
+  //   * The minimum width needed to display |label| on two lines.
+  int GetLabelWidth(const views::StyledLabel& label) const;
+
+  // Sets the state and triggers a repaint.
+  void SetDropdownState(State new_state);
+
+  // Sets |dropdown_button_| to have the correct image for the current state.
+  void UpdateDropdownButton();
+
+  // Shows the context menu at the specified location. |point| is in the view's
+  // coordinate system.
+  void ShowContextMenuImpl(const gfx::Rect& rect,
+                           ui::MenuSourceType source_type);
+
   // Opens a file while async scanning is still pending.
   void OpenDownloadDuringAsyncScanning();
 
+  // Submits the downloaded file to the safebrowsing download feedback service.
+  // Applies |download_command| if submission succeeds. Returns whether
+  // submission was successful.
+  bool SubmitDownloadToFeedbackService(
+      DownloadCommands::Command download_command);
+
   // Returns the height/width of the warning icon, in dp.
   static int GetWarningIconSize();
 
-  // Returns the height/width of the error icon, in dp.
-  static int GetErrorIconSize();
-
   // Starts deep scanning for this download item.
   void ConfirmDeepScanning();