Vectorize download shelf progress indicators

chrome/browser/download/download_shelf.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_
 
-#include "base/callback_forward.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 
 class Browser;
 
+namespace base {
+class TimeTicks;
+}
+
 namespace gfx {
 class Canvas;
 class ImageSkia;
 class Rect;
 }
 
 namespace content {
 class DownloadItem;
 class DownloadManager;
 }
 
+namespace ui {
+class ThemeProvider;
+}
+
 // This is an abstract base class for platform specific download shelf
 // implementations.
 class DownloadShelf {
  public:
   // Reason for closing download shelf.
   enum CloseReason {
     // Closing the shelf automatically. E.g.: all remaining downloads in the
     // shelf have been opened, last download in shelf was removed, or the
     // browser is switching to full-screen mode.
     AUTOMATIC,
 
     // Closing shelf due to a user selection. E.g.: the user clicked on the
     // 'close' button on the download shelf, or the shelf is being closed as a
     // side-effect of the user opening the downloads page.
     USER_ACTION
   };
 
   // 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,

[Peter Kasting, 2015/07/16 20:02:23]

Nit: kFiletypeIconSize

[Evan Stade, 2015/07/22 16:39:45]

was able to delete this one

 
     // Size of the progress asset that's painted behind the filetype icon.
     kSmallProgressIconSize = 39,

[Peter Kasting, 2015/07/16 20:02:23]

Nit:

    // Size of the overall progress indicator, including padding.
    kProgressIndicatorSize = 39,

[Evan Stade, 2015/07/22 16:39:45]

Done.

 
     kSmallProgressIconOffset = (kSmallProgressIconSize - kSmallIconSize) / 2

[Peter Kasting, 2015/07/16 20:02:23]

Nit: If we want to keep this, I'd name it kFiletypeIconSize.  However, it may
make more sense to just compute it where needed.

[Evan Stade, 2015/07/22 16:39:45]

Done.

   };
 
-  // Type of the callback used on toolkit-views platforms for the |rtl_mirror|
-  // argument of the PaintDownload functions. It captures the View subclass
-  // within which the progress animation is drawn and is used to update the
-  // correct 'left' value for the given rectangle in RTL locales. This is used
-  // to mirror the position of the progress animation. The callback is
-  // guaranteed to be invoked before the paint function returns.
-  typedef base::Callback<void(gfx::Rect*)> BoundsAdjusterCallback;
-
   DownloadShelf();
   virtual ~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);
-
+  // |progress_start_time| is only used for these unknown size downloads.
   static void PaintDownloadProgress(gfx::Canvas* canvas,
-                                    const BoundsAdjusterCallback& rtl_mirror,
-                                    int origin_x,
-                                    int origin_y,
-                                    int start_angle,
+                                    const ui::ThemeProvider& theme_provider,
+                                    const base::TimeTicks& progress_start_time,
                                     int percent);
 
   static void PaintDownloadComplete(gfx::Canvas* canvas,
-                                    const BoundsAdjusterCallback& rtl_mirror,
-                                    int origin_x,
-                                    int origin_y,
+                                    const ui::ThemeProvider& theme_provider,
                                     double animation_progress);
 
   static void PaintDownloadInterrupted(gfx::Canvas* canvas,
-                                       const BoundsAdjusterCallback& rtl_mirror,
-                                       int origin_x,
-                                       int origin_y,
+                                       const ui::ThemeProvider& theme_provider,
                                        double animation_progress);
 
   // A new download has started. Add it to our shelf and show the download
   // started animation.
   //
   // Some downloads are removed from the shelf on completion (See
   // DownloadItemModel::ShouldRemoveFromShelfWhenComplete()). These transient
   // downloads are added to the shelf after a delay. If the download completes
   // before the delay duration, it will not be added to the shelf at all.
   void AddDownload(content::DownloadItem* download);
@@ skipping 48 matching lines @@
   // download should belong to the DownloadManager returned by
   // GetDownloadManager().
   void ShowDownloadById(int32 download_id);
 
   bool should_show_on_unhide_;
   bool is_hidden_;
   base::WeakPtrFactory<DownloadShelf> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_SHELF_H_