Skip to content

GitLab

T
tangled
Commit 9e6c225b authored by Peter Kasting's avatar Peter Kasting Committed by Commit Bot
Browse files
Options

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: default avatarDavid Trainor <dtrainor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789611}
parent 73a5fd25
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 366 deletions
chrome/browser/ui/views/download/download_item_view.cc
View file @ 9e6c225b
...@@ -449,6 +449,8 @@ void DownloadItemView::GetAccessibleNodeData(ui::AXNodeData* node_data) { ...@@ -449,6 +449,8 @@ void DownloadItemView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
void DownloadItemView::ButtonPressed(views::Button* sender, void DownloadItemView::ButtonPressed(views::Button* sender,
const ui::Event& event) { const ui::Event& event) {
// TODO(pkasting): Refactor to simplify.
if (sender == open_now_button_) { if (sender == open_now_button_) {
OpenDownloadDuringAsyncScanning(); OpenDownloadDuringAsyncScanning();
return; return;
...@@ -506,7 +508,18 @@ void DownloadItemView::ButtonPressed(views::Button* sender, ...@@ -506,7 +508,18 @@ void DownloadItemView::ButtonPressed(views::Button* sender,
if (has_warning_label(mode_)) if (has_warning_label(mode_))
return; return;
complete_animation_.End(); 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; return;
} }
...@@ -575,10 +588,17 @@ void DownloadItemView::OnDownloadOpened() { ...@@ -575,10 +588,17 @@ void DownloadItemView::OnDownloadOpened() {
l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING, filename_string)); l10n_util::GetStringFUTF16(IDS_DOWNLOAD_STATUS_OPENING, filename_string));
SetEnabled(false); 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( base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
FROM_HERE, FROM_HERE,
base::BindOnce(&DownloadItemView::Reenable, base::BindOnce(std::move(reenable), weak_ptr_factory_.GetWeakPtr()),
weak_ptr_factory_.GetWeakPtr()),
base::TimeDelta::FromSeconds(3)); base::TimeDelta::FromSeconds(3));
// Notify our parent. // Notify our parent.
...@@ -669,15 +689,106 @@ void DownloadItemView::OnPaintBackground(gfx::Canvas* canvas) { ...@@ -669,15 +689,106 @@ void DownloadItemView::OnPaintBackground(gfx::Canvas* canvas) {
} }
void DownloadItemView::OnPaint(gfx::Canvas* canvas) { void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
// TODO(pkasting): Refactor to simplify.
OnPaintBackground(canvas); 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); OnPaintBorder(canvas);
} }
void DownloadItemView::OnThemeChanged() { void DownloadItemView::OnThemeChanged() {
views::View::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(); SchedulePaint();
UpdateDropdownButton(); UpdateDropdownButton();
} }
...@@ -882,298 +993,6 @@ void DownloadItemView::UpdateAccessibleAlertAndTimersForNormalMode() { ...@@ -882,298 +993,6 @@ 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();
}
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);
}
// 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;
}
// 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)
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);
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()));
}
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();
}
}
gfx::ImageSkia DownloadItemView::GetWarningIcon() {
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(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityMedium));
}
FALLTHROUGH;
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
case download::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_TOO_LARGE:
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_PASSWORD_PROTECTED:
case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_BLOCK:
return gfx::CreateVectorIcon(
vector_icons::kWarningIcon, GetWarningIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityHigh));
case download::DOWNLOAD_DANGER_TYPE_ASYNC_SCANNING:
case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_WARNING:
return gfx::CreateVectorIcon(
vector_icons::kErrorIcon, GetErrorIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_DefaultIconColor));
case download::DOWNLOAD_DANGER_TYPE_PROMPT_FOR_SCANNING:
return gfx::CreateVectorIcon(
vector_icons::kHelpIcon, GetErrorIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_DefaultIconColor));
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_UNSUPPORTED_FILETYPE:
case download::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_SAFE:
case download::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS:
case download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
case download::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
case download::DOWNLOAD_DANGER_TYPE_WHITELISTED_BY_POLICY:
case download::DOWNLOAD_DANGER_TYPE_MAX:
break;
}
switch (model_->GetMixedContentStatus()) {
case download::DownloadItem::MixedContentStatus::BLOCK:
return gfx::CreateVectorIcon(
vector_icons::kWarningIcon, GetWarningIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityHigh));
case download::DownloadItem::MixedContentStatus::WARN:
return gfx::CreateVectorIcon(
vector_icons::kErrorIcon, GetErrorIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityMedium));
case download::DownloadItem::MixedContentStatus::UNKNOWN:
case download::DownloadItem::MixedContentStatus::SAFE:
case download::DownloadItem::MixedContentStatus::VALIDATED:
case download::DownloadItem::MixedContentStatus::SILENT_BLOCK:
break;
}
NOTREACHED();
return gfx::ImageSkia();
}
gfx::Size DownloadItemView::GetButtonSize() const {
gfx::Size size;
if (discard_button_->GetVisible())
size.SetToMax(discard_button_->GetPreferredSize());
if (save_button_->GetVisible())
size.SetToMax(save_button_->GetPreferredSize());
if (scan_button_->GetVisible())
size.SetToMax(scan_button_->GetPreferredSize());
return size;
}
int DownloadItemView::GetLabelWidth(const views::StyledLabel& label) const {
auto lines_for_width = [&label](int width) {
return label.GetLayoutSizeInfoForWidth(width).line_sizes.size();
};
// Return 200 if that much width is sufficient to fit |label| on one line.
int width = 200;
if (lines_for_width(width) < 2)
return width;
// Find an upper bound width sufficient to fit |label| on two lines.
int min_width = 1, max_width;
for (max_width = width; lines_for_width(max_width) > 2; max_width *= 2)
min_width = max_width;
// Binary-search for the smallest width that fits on two lines.
// TODO(pkasting): Can use std::iota_view() when C++20 is available.
std::vector<int> widths(max_width + 1 - min_width);
std::iota(widths.begin(), widths.end(), min_width);
return *util::ranges::lower_bound(widths, 2, util::ranges::greater{},
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( void DownloadItemView::UpdateAccessibleAlert(
const base::string16& accessible_alert_text, const base::string16& accessible_alert_text,
bool is_last_update) { bool is_last_update) {
...@@ -1288,16 +1107,81 @@ void DownloadItemView::PaintDownloadProgress( ...@@ -1288,16 +1107,81 @@ void DownloadItemView::PaintDownloadProgress(
canvas->DrawPath(progress, progress_flags); canvas->DrawPath(progress, progress_flags);
} }
void DownloadItemView::AnimateStateTransition(State from, gfx::ImageSkia DownloadItemView::GetWarningIcon() {
State to, // TODO(drubery): Replace this with a constexpr variable when the new UX is
gfx::SlideAnimation* animation) { // fully launched.
if (from == NORMAL && to == HOT) { const int error_icon_size =
animation->Show(); base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings) ? 20
} else if (from == HOT && to == NORMAL) { : 27;
animation->Hide(); switch (model_->GetDangerType()) {
} else if (from != to) { case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
animation->Reset((to == HOT) ? 1.0 : 0.0); if (safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
model()->profile())
->IsUnderAdvancedProtection()) {
return gfx::CreateVectorIcon(
vector_icons::kErrorIcon, error_icon_size,
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityMedium));
}
FALLTHROUGH;
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
case download::DOWNLOAD_DANGER_TYPE_POTENTIALLY_UNWANTED:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE:
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_TOO_LARGE:
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_PASSWORD_PROTECTED:
case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_BLOCK:
return gfx::CreateVectorIcon(
vector_icons::kWarningIcon, GetWarningIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityHigh));
case download::DOWNLOAD_DANGER_TYPE_ASYNC_SCANNING:
case download::DOWNLOAD_DANGER_TYPE_SENSITIVE_CONTENT_WARNING:
return gfx::CreateVectorIcon(
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, error_icon_size,
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_DefaultIconColor));
case download::DOWNLOAD_DANGER_TYPE_BLOCKED_UNSUPPORTED_FILETYPE:
case download::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_SAFE:
case download::DOWNLOAD_DANGER_TYPE_DEEP_SCANNED_OPENED_DANGEROUS:
case download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS:
case download::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_USER_VALIDATED:
case download::DOWNLOAD_DANGER_TYPE_WHITELISTED_BY_POLICY:
case download::DOWNLOAD_DANGER_TYPE_MAX:
break;
}
switch (model_->GetMixedContentStatus()) {
case download::DownloadItem::MixedContentStatus::BLOCK:
return gfx::CreateVectorIcon(
vector_icons::kWarningIcon, GetWarningIconSize(),
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityHigh));
case download::DownloadItem::MixedContentStatus::WARN:
return gfx::CreateVectorIcon(
vector_icons::kErrorIcon, error_icon_size,
GetNativeTheme()->GetSystemColor(
ui::NativeTheme::kColorId_AlertSeverityMedium));
case download::DownloadItem::MixedContentStatus::UNKNOWN:
case download::DownloadItem::MixedContentStatus::SAFE:
case download::DownloadItem::MixedContentStatus::VALIDATED:
case download::DownloadItem::MixedContentStatus::SILENT_BLOCK:
break;
} }
NOTREACHED();
return gfx::ImageSkia();
} }
std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const { std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const {
...@@ -1325,32 +1209,125 @@ std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const { ...@@ -1325,32 +1209,125 @@ std::pair<base::string16, int> DownloadItemView::GetStatusTextAndStyle() const {
return {text, views::style::STYLE_PRIMARY}; return {text, views::style::STYLE_PRIMARY};
} }
gfx::Size DownloadItemView::GetButtonSize() const {
gfx::Size size;
if (discard_button_->GetVisible())
size.SetToMax(discard_button_->GetPreferredSize());
if (save_button_->GetVisible())
size.SetToMax(save_button_->GetPreferredSize());
if (scan_button_->GetVisible())
size.SetToMax(scan_button_->GetPreferredSize());
return size;
}
base::string16 DownloadItemView::ElidedFilename() { base::string16 DownloadItemView::ElidedFilename() {
return gfx::ElideFilename(model_->GetFileNameToReportUser(), font_list_, return gfx::ElideFilename(model_->GetFileNameToReportUser(), font_list_,
kTextWidth); kTextWidth);
} }
int DownloadItemView::GetLabelWidth(const views::StyledLabel& label) const {
auto lines_for_width = [&label](int width) {
return label.GetLayoutSizeInfoForWidth(width).line_sizes.size();
};
// Return 200 if that much width is sufficient to fit |label| on one line.
int width = 200;
if (lines_for_width(width) < 2)
return width;
// Find an upper bound width sufficient to fit |label| on two lines.
int min_width = 1, max_width;
for (max_width = width; lines_for_width(max_width) > 2; max_width *= 2)
min_width = max_width;
// Binary-search for the smallest width that fits on two lines.
// TODO(pkasting): Can use std::iota_view() when C++20 is available.
std::vector<int> widths(max_width + 1 - min_width);
std::iota(widths.begin(), widths.end(), min_width);
return *util::ranges::lower_bound(widths, 2, util::ranges::greater{},
std::move(lines_for_width));
}
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::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 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);
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::OpenDownloadDuringAsyncScanning() { void DownloadItemView::OpenDownloadDuringAsyncScanning() {
model_->CompleteSafeBrowsingScan(); model_->CompleteSafeBrowsingScan();
model_->SetOpenWhenComplete(true); model_->SetOpenWhenComplete(true);
} }
// static bool DownloadItemView::SubmitDownloadToFeedbackService(
int DownloadItemView::GetWarningIconSize() { DownloadCommands::Command download_command) {
// TODO(drubery): Replace this method with a constexpr variable when the new #if BUILDFLAG(FULL_SAFE_BROWSING)
// UX is fully launched. safe_browsing::SafeBrowsingService* sb_service =
return base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings) g_browser_process->safe_browsing_service();
? 20 if (!sb_service)
: 24; 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);
}
// WARNING: we are deleted at this point. Don't access 'this'.
return true;
#else
NOTREACHED();
return false;
#endif
} }
// static // static
int DownloadItemView::GetErrorIconSize() { int DownloadItemView::GetWarningIconSize() {
// TODO(drubery): Replace this method with a constexpr variable when the new // TODO(drubery): Replace this method with a constexpr variable when the new
// UX is fully launched. // UX is fully launched.
return base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings) return base::FeatureList::IsEnabled(safe_browsing::kUseNewDownloadWarnings)
? 20 ? 20
: 27; : 24;
} }
void DownloadItemView::ConfirmDeepScanning() { void DownloadItemView::ConfirmDeepScanning() {
......
chrome/browser/ui/views/download/download_item_view.h
View file @ 9e6c225b
...@@ -148,49 +148,6 @@ class DownloadItemView : public views::View, ...@@ -148,49 +148,6 @@ class DownloadItemView : public views::View,
// Updates the accessible alert and timers for normal mode. // Updates the accessible alert and timers for normal mode.
void UpdateAccessibleAlertAndTimersForNormalMode(); 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. // Update accessible status text.
// If |is_last_update| is false, then a timer is used to notify screen readers // 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, // to speak the alert text on a regular interval. If |is_last_update| is true,
...@@ -217,28 +174,48 @@ class DownloadItemView : public views::View, ...@@ -217,28 +174,48 @@ class DownloadItemView : public views::View,
const base::TimeDelta& indeterminate_progress_time, const base::TimeDelta& indeterminate_progress_time,
int percent_done) const; int percent_done) const;
// Show/Hide/Reset |animation| based on the state transition specified by // When not in normal mode, returns the current help/warning/error icon.
// |from| and |to|. gfx::ImageSkia GetWarningIcon();
void AnimateStateTransition(State from,
State to,
gfx::SlideAnimation* animation);
// Returns the text and style to use for the status label. // Returns the text and style to use for the status label.
std::pair<base::string16, int> GetStatusTextAndStyle() const; 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 // Returns the file name to report to user. It might be elided to fit into
// the text width. // the text width.
base::string16 ElidedFilename(); 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. // Opens a file while async scanning is still pending.
void OpenDownloadDuringAsyncScanning(); 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. // Returns the height/width of the warning icon, in dp.
static int GetWarningIconSize(); static int GetWarningIconSize();
// Returns the height/width of the error icon, in dp.
static int GetErrorIconSize();
// Starts deep scanning for this download item. // Starts deep scanning for this download item.
void ConfirmDeepScanning(); void ConfirmDeepScanning();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment