Use DownloadItem::GetState() in chrome/

chrome/browser/ui/gtk/download/download_item_gtk.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/download/download_item_gtk.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/debug/trace_event.h"
 #include "base/metrics/histogram.h"
@@ skipping 438 matching lines @@
 
 // Icon loading functions.
 
 void DownloadItemGtk::OnLoadSmallIconComplete(gfx::Image* image) {
   icon_small_ = image;
   gtk_widget_queue_draw(progress_area_.get());
 }
 
 void DownloadItemGtk::OnLoadLargeIconComplete(gfx::Image* image) {
   icon_large_ = image;
-  if (download()->IsComplete())
+  if (download()->GetState() == DownloadItem::COMPLETE)
     DownloadItemDrag::SetSource(body_.get(), download(), icon_large_);
   // Else, the download will be made draggable once an OnDownloadUpdated()
-  // notification is received with download->IsComplete().
+  // notification is received with a download in COMPLETE state.
 }
 
 void DownloadItemGtk::LoadIcon() {
   cancelable_task_tracker_.TryCancelAll();
   IconManager* im = g_browser_process->icon_manager();
   icon_filepath_ = download()->GetTargetFilePath();
   im->LoadIcon(icon_filepath_,
                IconLoader::SMALL,
                base::Bind(&DownloadItemGtk::OnLoadSmallIconComplete,
                           base::Unretained(this)),
@@ skipping 369 matching lines @@
 
 gboolean DownloadItemGtk::OnProgressAreaExpose(GtkWidget* widget,
                                                GdkEventExpose* event) {
   TRACE_EVENT0("ui::gtk", "DownloadItemGtk::OnProgressAreaExpose");
 
   GtkAllocation allocation;
   gtk_widget_get_allocation(widget, &allocation);
 
   // Create a transparent canvas.
   gfx::CanvasSkiaPaint canvas(event, false);
+  DownloadItem::DownloadState state = download()->GetState();
   if (complete_animation_.is_animating()) {
-    if (download()->IsInterrupted()) {
+    if (state == DownloadItem::INTERRUPTED) {
       download_util::PaintDownloadInterrupted(&canvas,
           allocation.x, allocation.y,
           complete_animation_.GetCurrentValue(),
           download_util::SMALL);
     } else {
       download_util::PaintDownloadComplete(&canvas,
           allocation.x, allocation.y,
           complete_animation_.GetCurrentValue(),
           download_util::SMALL);
     }
-  } else if (download()->IsInProgress()) {
+  } else if (state == DownloadItem::IN_PROGRESS) {
     download_util::PaintDownloadProgress(&canvas,
         allocation.x, allocation.y,
         progress_angle_,
         download_model_.PercentComplete(),
         download_util::SMALL);
   }
 
   // |icon_small_| may be NULL if it is still loading. If the file is an
   // unrecognized type then we will get back a generic system icon. Hence
   // there is no need to use the chromium-specific default download item icon.
@@ skipping 44 matching lines @@
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
                            base::Time::Now() - creation_time_);
   download()->ValidateDangerousDownload();
 }
 
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - creation_time_);
   download()->Remove();
 }