Remove DownloadItem::GetUserVerifiedFilePath()

chrome/browser/ui/views/download/download_item_view.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/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 390 matching lines @@
     return true;
 
   if (!starting_drag_) {
     starting_drag_ = true;
     drag_start_point_ = event.location();
   }
   if (dragging_) {
     if (download()->IsComplete()) {
       IconManager* im = g_browser_process->icon_manager();
       gfx::Image* icon = im->LookupIconFromFilepath(
-          download()->GetUserVerifiedFilePath(), IconLoader::SMALL);
+          download()->GetTargetFilePath(), IconLoader::SMALL);
       if (icon) {
         views::Widget* widget = GetWidget();
         download_util::DragDownload(download(), icon,
                                     widget ? widget->GetNativeView() : NULL);
       }
     }
   } else if (ExceededDragThreshold(event.location() - drag_start_point_)) {
     dragging_ = true;
   }
   return true;
@@ skipping 346 matching lines @@
     // Draw the file's name.
     canvas->DrawStringInt(filename, font_,
                           enabled() ? file_name_color
                                     : kFileNameDisabledColor,
                           mirrored_x, y, kTextWidth, font_.GetHeight());
   }
 
   // Load the icon.
   IconManager* im = g_browser_process->icon_manager();
   gfx::Image* image = im->LookupIconFromFilepath(
-      download()->GetUserVerifiedFilePath(),IconLoader::SMALL);
+      download()->GetTargetFilePath(), IconLoader::SMALL);
   const gfx::ImageSkia* icon = NULL;
   if (IsShowingWarningDialog())
     icon = warning_icon_;
   else if (image)
     icon = image->ToImageSkia();
 
   // We count on the fact that the icon manager will cache the icons and if one
   // is available, it will be cached here. We *don't* want to request the icon
   // to be loaded here, since this will also get called if the icon can't be
   // loaded, in which case LookupIcon will always be NULL. The loading will be
@@ skipping 47 matching lines @@
   // We're interested in how long it takes users to open downloads.  If they
   // open downloads super quickly, we should be concerned about clickjacking.
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
                            base::Time::Now() - creation_time_);
   download()->OpenDownload();
   UpdateAccessibleName();
 }
 
 void DownloadItemView::LoadIcon() {
   IconManager* im = g_browser_process->icon_manager();
-  last_download_item_path_ = download()->GetUserVerifiedFilePath();
+  last_download_item_path_ = download()->GetTargetFilePath();
   im->LoadIcon(last_download_item_path_,
                IconLoader::SMALL,
                base::Bind(&DownloadItemView::OnExtractIconComplete,
                           base::Unretained(this)),
                &cancelable_task_tracker_);
 }
 
 void DownloadItemView::LoadIconIfItemPathChanged() {
-  base::FilePath current_download_path = download()->GetUserVerifiedFilePath();
+  base::FilePath current_download_path = download()->GetTargetFilePath();
   if (last_download_item_path_ == current_download_path)
     return;
 
   LoadIcon();
 }
 
 void DownloadItemView::UpdateColorsFromTheme() {
   if (dangerous_download_label_ && GetThemeProvider()) {
     dangerous_download_label_->SetEnabledColor(
         GetThemeProvider()->GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT));
@@ skipping 346 matching lines @@
 void DownloadItemView::AnimateStateTransition(State from, State to,
                                               ui::SlideAnimation* animation) {
   if (from == NORMAL && to == HOT) {
     animation->Show();
   } else if (from == HOT && to == NORMAL) {
     animation->Hide();
   } else if (from != to) {
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }