Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7811)

Unified Diff: chrome/browser/ui/gtk/download/download_item_gtk.cc

Issue 15011006: Remove DownloadItem::GetUserVerifiedFilePath() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with r201294 Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/gtk/download/download_item_gtk.cc
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc
index b401f5d440d96dae514fd7deebe2ec224a098068..707fab270ebbecd3e15405414bc1c94ab234fde3 100644
--- a/chrome/browser/ui/gtk/download/download_item_gtk.cc
+++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc
@@ -319,12 +319,8 @@ void DownloadItemGtk::OnDownloadUpdated(DownloadItem* download_item) {
parent_shelf_->MaybeShowMoreDownloadItems();
}
- if (download()->GetUserVerifiedFilePath() != icon_filepath_) {
- // Turns out the file path is "Unconfirmed %d.crdownload" for dangerous
- // downloads. When the download is confirmed, the file is renamed on
- // another thread, so reload the icon if the download filename changes.
+ if (download()->GetTargetFilePath() != icon_filepath_) {
LoadIcon();
-
UpdateTooltip();
}
@@ -469,7 +465,7 @@ void DownloadItemGtk::OnLoadLargeIconComplete(gfx::Image* image) {
void DownloadItemGtk::LoadIcon() {
cancelable_task_tracker_.TryCancelAll();
IconManager* im = g_browser_process->icon_manager();
- icon_filepath_ = download()->GetUserVerifiedFilePath();
+ icon_filepath_ = download()->GetTargetFilePath();
im->LoadIcon(icon_filepath_,
IconLoader::SMALL,
base::Bind(&DownloadItemGtk::OnLoadSmallIconComplete,
« no previous file with comments | « chrome/browser/ui/cocoa/download/download_item_mac.mm ('k') | chrome/browser/ui/views/download/download_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698