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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/views/download_tab_view.cc

Issue 7344: Convert GetPreferredSize from:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 2 months 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
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/browser/views/download_tab_view.h ('k') | chrome/browser/views/first_run_bubble.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/download_tab_view.cc
===================================================================
--- chrome/browser/views/download_tab_view.cc (revision 3391)
+++ chrome/browser/views/download_tab_view.cc (working copy)
@@ -194,22 +194,19 @@
parent_->LookupIcon(model_);
}
-void DownloadItemTabView::GetPreferredSize(CSize* out) {
- CSize pause_size;
- pause_->GetPreferredSize(&pause_size);
- CSize cancel_size;
- cancel_->GetPreferredSize(&cancel_size);
- CSize show_size;
- show_->GetPreferredSize(&show_size);
-
- out->cx = download_util::kBigProgressIconSize +
- 2 * kSpacer +
- kHorizontalLinkPadding +
- kFilenameSize +
- std::max(pause_size.cx + cancel_size.cx + kHorizontalLinkPadding,
- show_size.cx);
-
- out->cy = download_util::kBigProgressIconSize;
+gfx::Size DownloadItemTabView::GetPreferredSize() {
+ gfx::Size pause_size = pause_->GetPreferredSize();
+ gfx::Size cancel_size = cancel_->GetPreferredSize();
+ gfx::Size show_size = show_->GetPreferredSize();
+ return gfx::Size(
+ download_util::kBigProgressIconSize +
+ 2 * kSpacer +
+ kHorizontalLinkPadding +
+ kFilenameSize +
+ std::max(pause_size.width() + cancel_size.width() +
+ kHorizontalLinkPadding,
+ show_size.width()),
+ download_util::kBigProgressIconSize);
}
// Each DownloadItemTabView has reasonably complex layout requirements
@@ -250,20 +247,17 @@
return;
}
- CSize since_size;
-
since_->SetText(TimeFormat::RelativeDate(model_->start_time(), NULL));
- since_->GetPreferredSize(&since_size);
+ gfx::Size since_size = since_->GetPreferredSize();
since_->SetBounds(kLeftMargin, download_util::kBigProgressIconOffset,
- kDateSize, since_size.cy);
+ kDateSize, since_size.height());
since_->SetVisible(true);
- CSize date_size;
date_->SetText(base::TimeFormatShortDate(model_->start_time()));
- date_->GetPreferredSize(&date_size);
- date_->SetBounds(kLeftMargin, since_size.cy + kVerticalPadding +
- download_util::kBigProgressIconOffset,
- kDateSize, date_size.cy);
+ gfx::Size date_size = date_->GetPreferredSize();
+ date_->SetBounds(kLeftMargin, since_size.height() + kVerticalPadding +
+ download_util::kBigProgressIconOffset,
+ kDateSize, date_size.height());
date_->SetVisible(true);
}
@@ -287,35 +281,32 @@
download_util::kBigProgressIconSize + kInfoPadding;
// File name and URL
- CSize file_name_size;
file_name_->SetText(model_->file_name());
- file_name_->GetPreferredSize(&file_name_size);
+ gfx::Size file_name_size = file_name_->GetPreferredSize();
file_name_->SetBounds(dx, download_util::kBigProgressIconOffset,
std::min(kFilenameSize,
- static_cast<int>(file_name_size.cx)),
- file_name_size.cy);
+ static_cast<int>(file_name_size.width())),
+ file_name_size.height());
file_name_->SetVisible(true);
file_name_->SetEnabled(true);
GURL url(model_->url());
download_url_->SetURL(url);
- CSize url_size;
- download_url_->GetPreferredSize(&url_size);
+ gfx::Size url_size = download_url_->GetPreferredSize();
download_url_->SetBounds(dx,
- file_name_size.cy + kVerticalPadding +
- download_util::kBigProgressIconOffset,
+ file_name_size.height() + kVerticalPadding +
+ download_util::kBigProgressIconOffset,
std::min(kFilenameSize,
static_cast<int>(width() - dx)),
- url_size.cy);
+ url_size.height());
download_url_->SetVisible(true);
dx += kFilenameSize + kSpacer;
// Action button (text is constant and set in constructor)
- CSize show_size;
- show_->GetPreferredSize(&show_size);
- show_->SetBounds(dx, ((file_name_size.cy + url_size.cy) / 2) +
+ gfx::Size show_size = show_->GetPreferredSize();
+ show_->SetBounds(dx, ((file_name_size.height() + url_size.height()) / 2) +
download_util::kBigProgressIconOffset,
- show_size.cx, show_size.cy);
+ show_size.width(), show_size.height());
show_->SetVisible(true);
show_->SetEnabled(true);
}
@@ -340,36 +331,33 @@
download_util::kBigProgressIconSize + kInfoPadding;
// File name and URL, truncated to show cancelled status
- CSize file_name_size;
file_name_->SetText(model_->file_name());
- file_name_->GetPreferredSize(&file_name_size);
+ gfx::Size file_name_size = file_name_->GetPreferredSize();
file_name_->SetBounds(dx, download_util::kBigProgressIconOffset,
kFilenameSize - kProgressSize - kSpacer,
- file_name_size.cy);
+ file_name_size.height());
file_name_->SetVisible(true);
file_name_->SetEnabled(false);
GURL url(model_->url());
download_url_->SetURL(url);
- CSize url_size;
- download_url_->GetPreferredSize(&url_size);
+ gfx::Size url_size = download_url_->GetPreferredSize();
download_url_->SetBounds(dx,
- file_name_size.cy + kVerticalPadding +
+ file_name_size.height() + kVerticalPadding +
download_util::kBigProgressIconOffset,
std::min(kFilenameSize - kProgressSize - kSpacer,
static_cast<int>(width() - dx)),
- url_size.cy);
+ url_size.height());
download_url_->SetVisible(true);
dx += kFilenameSize - kProgressSize;
// Display cancelled status
- CSize cancel_size;
time_remaining_->SetColor(kStatusColor);
time_remaining_->SetText(l10n_util::GetString(IDS_DOWNLOAD_TAB_CANCELLED));
- time_remaining_->GetPreferredSize(&cancel_size);
+ gfx::Size cancel_size = time_remaining_->GetPreferredSize();
time_remaining_->SetBounds(dx, download_util::kBigProgressIconOffset,
- kProgressSize, cancel_size.cy);
+ kProgressSize, cancel_size.height());
time_remaining_->SetVisible(true);
// Display received size, we may not know the total size if the server didn't
@@ -404,14 +392,13 @@
total_text);
}
- CSize byte_size;
download_progress_->SetText(amount);
- download_progress_->GetPreferredSize(&byte_size);
+ gfx::Size byte_size = download_progress_->GetPreferredSize();
download_progress_->SetBounds(dx,
- file_name_size.cy + kVerticalPadding +
+ file_name_size.height() + kVerticalPadding +
download_util::kBigProgressIconOffset,
kProgressSize,
- byte_size.cy);
+ byte_size.height());
download_progress_->SetVisible(true);
}
@@ -432,24 +419,22 @@
kInfoPadding;
// File name and URL, truncated to show progress status
- CSize file_name_size;
file_name_->SetText(model_->GetFileName());
- file_name_->GetPreferredSize(&file_name_size);
+ gfx::Size file_name_size = file_name_->GetPreferredSize();
file_name_->SetBounds(dx, download_util::kBigProgressIconOffset,
kFilenameSize - kProgressSize - kSpacer,
- file_name_size.cy);
+ file_name_size.height());
file_name_->SetVisible(true);
file_name_->SetEnabled(false);
GURL url(model_->url());
download_url_->SetURL(url);
- CSize url_size;
- download_url_->GetPreferredSize(&url_size);
- download_url_->SetBounds(dx, file_name_size.cy + kVerticalPadding +
+ gfx::Size url_size = download_url_->GetPreferredSize();
+ download_url_->SetBounds(dx, file_name_size.height() + kVerticalPadding +
download_util::kBigProgressIconOffset,
std::min(kFilenameSize - kProgressSize - kSpacer,
static_cast<int>(width() - dx)),
- url_size.cy);
+ url_size.height());
download_url_->SetVisible(true);
dx += kFilenameSize - kProgressSize;
@@ -518,41 +503,40 @@
}
// Time remaining
- int y_pos = file_name_size.cy + kVerticalPadding +
+ int y_pos = file_name_size.height() + kVerticalPadding +
download_util::kBigProgressIconOffset;
- CSize time_size;
+ gfx::Size time_size;
time_remaining_->SetColor(kStatusColor);
if (model_->is_paused()) {
time_remaining_->SetColor(kPauseColor);
time_remaining_->SetText(
l10n_util::GetString(IDS_DOWNLOAD_PROGRESS_PAUSED));
- time_remaining_->GetPreferredSize(&time_size);
+ time_size = time_remaining_->GetPreferredSize();
time_remaining_->SetBounds(dx, download_util::kBigProgressIconOffset,
- kProgressSize, time_size.cy);
+ kProgressSize, time_size.height());
time_remaining_->SetVisible(true);
} else if (total > 0) {
TimeDelta remaining;
if (model_->TimeRemaining(&remaining))
time_remaining_->SetText(TimeFormat::TimeRemaining(remaining));
- time_remaining_->GetPreferredSize(&time_size);
+ time_size = time_remaining_->GetPreferredSize();
time_remaining_->SetBounds(dx, download_util::kBigProgressIconOffset,
- kProgressSize, time_size.cy);
+ kProgressSize, time_size.height());
time_remaining_->SetVisible(true);
} else {
time_remaining_->SetText(L"");
- y_pos = ((file_name_size.cy + url_size.cy) / 2) +
+ y_pos = ((file_name_size.height() + url_size.height()) / 2) +
download_util::kBigProgressIconOffset;
}
- CSize byte_size;
download_progress_->SetText(progress);
- download_progress_->GetPreferredSize(&byte_size);
+ gfx::Size byte_size = download_progress_->GetPreferredSize();
download_progress_->SetBounds(dx, y_pos,
- kProgressSize, byte_size.cy);
+ kProgressSize, byte_size.height());
download_progress_->SetVisible(true);
dx += kProgressSize + kSpacer;
- y_pos = ((file_name_size.cy + url_size.cy) / 2) +
+ y_pos = ((file_name_size.height() + url_size.height()) / 2) +
download_util::kBigProgressIconOffset;
// Pause (or Resume) / Cancel buttons.
@@ -561,17 +545,15 @@
else
pause_->SetText(l10n_util::GetString(IDS_DOWNLOAD_LINK_PAUSE));
- CSize pause_size;
pause_->SetVisible(true);
pause_->SetEnabled(true);
- pause_->GetPreferredSize(&pause_size);
- pause_->SetBounds(dx, y_pos, pause_size.cx, pause_size.cy);
+ gfx::Size pause_size = pause_->GetPreferredSize();
+ pause_->SetBounds(dx, y_pos, pause_size.width(), pause_size.height());
- dx += pause_size.cx + kHorizontalLinkPadding;
+ dx += pause_size.width() + kHorizontalLinkPadding;
- CSize cancel_size;
- cancel_->GetPreferredSize(&cancel_size);
- cancel_->SetBounds(dx, y_pos, cancel_size.cx, cancel_size.cy);
+ gfx::Size cancel_size = cancel_->GetPreferredSize();
+ cancel_->SetBounds(dx, y_pos, cancel_size.width(), cancel_size.height());
cancel_->SetVisible(true);
cancel_->SetEnabled(true);
}
@@ -595,41 +577,38 @@
kInfoPadding;
// Warning message and URL.
- CSize warning_size;
std::wstring file_name;
ElideString(model_->original_name(), kFileNameMaxLength, &file_name);
dangerous_download_warning_->SetText(
l10n_util::GetStringF(IDS_PROMPT_DANGEROUS_DOWNLOAD, file_name));
- dangerous_download_warning_->GetPreferredSize(&warning_size);
+ gfx::Size warning_size = dangerous_download_warning_->GetPreferredSize();
dangerous_download_warning_->SetBounds(dx, 0,
- kFilenameSize, warning_size.cy);
+ kFilenameSize, warning_size.height());
dangerous_download_warning_->SetVisible(true);
GURL url(model_->url());
download_url_->SetURL(url);
- CSize url_size;
- download_url_->GetPreferredSize(&url_size);
- download_url_->SetBounds(dx, height() - url_size.cy,
+ gfx::Size url_size = download_url_->GetPreferredSize();
+ download_url_->SetBounds(dx, height() - url_size.height(),
std::min(kFilenameSize - kSpacer,
static_cast<int>(width() - dx)),
- url_size.cy);
+ url_size.height());
download_url_->SetVisible(true);
dx += kFilenameSize + kSpacer;
// Save/Discard buttons.
- CSize button_size;
- save_button_->GetPreferredSize(&button_size);
- save_button_->SetBounds(dx, (height() - button_size.cy) / 2,
- button_size.cx, button_size.cy);
+ gfx::Size button_size = save_button_->GetPreferredSize();
+ save_button_->SetBounds(dx, (height() - button_size.height()) / 2,
+ button_size.width(), button_size.height());
save_button_->SetVisible(true);
save_button_->SetEnabled(true);
- dx += button_size.cx + kHorizontalButtonPadding;
+ dx += button_size.width() + kHorizontalButtonPadding;
- discard_button_->GetPreferredSize(&button_size);
- discard_button_->SetBounds(dx, (height() - button_size.cy) / 2,
- button_size.cx, button_size.cy);
+ button_size = discard_button_->GetPreferredSize();
+ discard_button_->SetBounds(dx, (height() - button_size.height()) / 2,
+ button_size.width(), button_size.height());
discard_button_->SetVisible(true);
discard_button_->SetEnabled(true);
}
« chrome/browser/views/download_shelf_view.cc ('K') | « chrome/browser/views/download_tab_view.h ('k') | chrome/browser/views/first_run_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698