Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4026)

Unified Diff: chrome/browser/ui/views/download/download_item_view.cc

Issue 8503018: Split DownloadItem into an ABC, an Impl, and a Mock. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: merge Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/download/download_item_view.cc
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index 5bfb228b1440d7817c0c5c2c3fbad0520b333ca7..d90f31c7a90f2017f04f86d23463bb5297110835 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -211,7 +211,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
body_hover_animation_.reset(new ui::SlideAnimation(this));
drop_hover_animation_.reset(new ui::SlideAnimation(this));
- if (download->safety_state() == DownloadItem::DANGEROUS)
+ if (download->GetSafetyState() == DownloadItem::DANGEROUS)
EnterDangerousMode();
UpdateAccessibleName();
@@ -264,20 +264,20 @@ void DownloadItemView::OnDownloadUpdated(DownloadItem* download) {
DCHECK(download == download_);
if (body_state_ == DANGEROUS &&
- download->safety_state() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
+ download->GetSafetyState() == DownloadItem::DANGEROUS_BUT_VALIDATED) {
// We have been approved.
ClearDangerousMode();
} else if (body_state_ != DANGEROUS &&
- download->safety_state() == DownloadItem::DANGEROUS) {
+ download->GetSafetyState() == DownloadItem::DANGEROUS) {
EnterDangerousMode();
// Force the shelf to layout again as our size has changed.
parent_->Layout();
SchedulePaint();
} else {
string16 status_text = model_->GetStatusText();
- switch (download_->state()) {
+ switch (download_->GetState()) {
case DownloadItem::IN_PROGRESS:
- download_->is_paused() ?
+ download_->IsPaused() ?
StopDownloadProgress() : StartDownloadProgress();
LoadIconIfItemPathChanged();
break;
@@ -291,7 +291,7 @@ void DownloadItemView::OnDownloadUpdated(DownloadItem* download) {
LoadIcon();
break;
case DownloadItem::COMPLETE:
- if (download_->auto_opened()) {
+ if (download_->GetAutoOpened()) {
parent_->RemoveDownloadView(this); // This will delete us!
return;
}
@@ -567,7 +567,7 @@ void DownloadItemView::ShowContextMenu(const gfx::Point& p,
void DownloadItemView::GetAccessibleState(ui::AccessibleViewState* state) {
state->name = accessible_name_;
state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
- if (download_->safety_state() == DownloadItem::DANGEROUS) {
+ if (download_->GetSafetyState() == DownloadItem::DANGEROUS) {
state->state = ui::AccessibilityTypes::STATE_UNAVAILABLE;
} else {
state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
@@ -900,7 +900,7 @@ void DownloadItemView::SetState(State body_state, State drop_down_state) {
}
void DownloadItemView::ClearDangerousMode() {
- DCHECK(download_->safety_state() == DownloadItem::DANGEROUS_BUT_VALIDATED &&
+ DCHECK(download_->GetSafetyState() == DownloadItem::DANGEROUS_BUT_VALIDATED &&
body_state_ == DANGEROUS && drop_down_state_ == DANGEROUS);
body_state_ = NORMAL;
@@ -950,7 +950,7 @@ void DownloadItemView::EnterDangerousMode() {
// Ensure the file name is not too long.
// Extract the file extension (if any).
- FilePath filename(download_->target_name());
+ FilePath filename(download_->GetTargetName());
#if defined(OS_POSIX)
string16 extension = WideToUTF16(base::SysNativeMBToWide(
filename.Extension()));
@@ -1114,7 +1114,7 @@ bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
void DownloadItemView::UpdateAccessibleName() {
string16 new_name;
- if (download_->safety_state() == DownloadItem::DANGEROUS) {
+ if (download_->GetSafetyState() == DownloadItem::DANGEROUS) {
new_name = dangerous_download_label_->GetText();
} else {
new_name = status_text_ + char16(' ') +
« no previous file with comments | « chrome/browser/ui/gtk/download/download_shelf_gtk.cc ('k') | chrome/browser/ui/views/download/download_shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698