| Index: chrome/browser/download/download_shelf.h
|
| diff --git a/chrome/browser/download/download_shelf.h b/chrome/browser/download/download_shelf.h
|
| index 4e14c39b227c6c9ef2da87e313118f4954989eb9..5d160abccbd10841ae880f660fd49535f43b2de3 100644
|
| --- a/chrome/browser/download/download_shelf.h
|
| +++ b/chrome/browser/download/download_shelf.h
|
| @@ -12,6 +12,10 @@
|
|
|
| class Browser;
|
|
|
| +namespace base {
|
| +class TimeTicks;
|
| +}
|
| +
|
| namespace gfx {
|
| class Canvas;
|
| class ImageSkia;
|
| @@ -43,20 +47,8 @@ class DownloadShelf {
|
| // Download progress animations ----------------------------------------------
|
|
|
| enum {
|
| - // Arc sweep angle for use with downloads of unknown size.
|
| - kUnknownAngleDegrees = 50,
|
| -
|
| - // Rate of progress for use with downloads of unknown size.
|
| - kUnknownIncrementDegrees = 12,
|
| -
|
| - // Start angle for downloads with known size (midnight position).
|
| - kStartAngleDegrees = -90,
|
| -
|
| - // A the maximum number of degrees of a circle.
|
| - kMaxDegrees = 360,
|
| -
|
| // Progress animation timer period, in milliseconds.
|
| - kProgressRateMs = 150,
|
| + kProgressRateMs = 30,
|
|
|
| // Size of the filetype icon.
|
| kSmallIconSize = 16,
|
| @@ -81,32 +73,14 @@ class DownloadShelf {
|
| // Paint the common download animation progress foreground and background,
|
| // clipping the foreground to 'percent' full. If percent is -1, then we don't
|
| // know the total size, so we just draw a rotating segment until we're done.
|
| - static void PaintCustomDownloadProgress(
|
| - gfx::Canvas* canvas,
|
| - const gfx::ImageSkia& background_image,
|
| - const gfx::ImageSkia& foreground_image,
|
| - int image_size,
|
| - const gfx::Rect& bounds,
|
| - int start_angle,
|
| - int percent_done);
|
| -
|
| static void PaintDownloadProgress(gfx::Canvas* canvas,
|
| - const BoundsAdjusterCallback& rtl_mirror,
|
| - int origin_x,
|
| - int origin_y,
|
| - int start_angle,
|
| + const base::TimeTicks& progress_start_time,
|
| int percent);
|
|
|
| static void PaintDownloadComplete(gfx::Canvas* canvas,
|
| - const BoundsAdjusterCallback& rtl_mirror,
|
| - int origin_x,
|
| - int origin_y,
|
| double animation_progress);
|
|
|
| static void PaintDownloadInterrupted(gfx::Canvas* canvas,
|
| - const BoundsAdjusterCallback& rtl_mirror,
|
| - int origin_x,
|
| - int origin_y,
|
| double animation_progress);
|
|
|
| // A new download has started. Add it to our shelf and show the download
|
|
|