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

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: CamelCase 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 b98ca173cafb2ebff80ba16f2b7ad9e214e62b0c..cf7c10d162983d11039a36b361324d1986b78e28 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -210,7 +210,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) {
tooltip_text_.clear();
body_state_ = DANGEROUS;
drop_down_state_ = DANGEROUS;
@@ -228,7 +228,7 @@ DownloadItemView::DownloadItemView(DownloadItem* download,
// 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()));
@@ -336,15 +336,15 @@ 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();
}
string16 status_text = model_->GetStatusText();
- switch (download_->state()) {
+ switch (download_->GetState()) {
case DownloadItem::IN_PROGRESS:
- download_->is_paused() ? StopDownloadProgress() : StartDownloadProgress();
+ download_->IsPaused() ? StopDownloadProgress() : StartDownloadProgress();
LoadIconIfItemPathChanged();
break;
case DownloadItem::INTERRUPTED:
@@ -357,7 +357,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;
}
@@ -633,7 +633,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;
@@ -966,7 +966,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;
@@ -1098,7 +1098,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(' ') +

Powered by Google App Engine
This is Rietveld 408576698