Removing static initializers.

BUG=None
TEST=Make sure download bar is still working fine.
Review URL: http://codereview.chromium.org/2431

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2137 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 27 deletions

diff --git a/chrome/browser/download_util.cc b/chrome/browser/download_util.cc
index c59c25e..c008ab9 100644
--- a/chrome/browser/download_util.cc
+++ b/chrome/browser/download_util.cc
@@ -265,7 +265,8 @@ void PaintDownloadProgress(ChromeCanvas* canvas,
   SkBitmap* background = (size == BIG) ? g_background_32 : g_background_16;
   SkBitmap* foreground = (size == BIG) ? g_foreground_32 : g_foreground_16;
 
-  const int kProgressIconSize = GetProgressIconSize(size);
+  const int kProgressIconSize = (size == BIG) ? kBigProgressIconSize :
+                                                kSmallProgressIconSize;
 
   int height = background->height();
 
@@ -384,32 +385,6 @@ void PaintDownloadComplete(ChromeCanvas* canvas,
   canvas->restore();
 }
 
-// XP and Vista must support icons of this size.
-const int kBigIconSize = 32;
-const int kSmallIconSize = 16;
-
-// Our progress halo around the icon
-const int kBigProgressIconSize = 52;
-const int kSmallProgressIconSize = 39;
-
-int GetIconSize(PaintDownloadProgressSize size) {
-  if (size == SMALL)
-    return kSmallIconSize;
-  return kBigIconSize;
-}
-
-int GetProgressIconSize(PaintDownloadProgressSize size) {
-  if (size == SMALL)
-    return kSmallProgressIconSize;
-  return kBigProgressIconSize ;
-}
-
-int GetProgressIconOffset(PaintDownloadProgressSize size) {
-  if (size == SMALL)
-    return (kSmallProgressIconSize - kSmallIconSize) / 2;
-  return (kBigProgressIconSize - kBigIconSize) / 2;
-}
-
 // Download dragging
 void DragDownload(const DownloadItem* download, SkBitmap* icon) {
   DCHECK(download);