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

Side by Side Diff: chrome/browser/ui/gtk/download/download_item_gtk.cc

Issue 7294013: Modified cancel and interrupt processing to avoid race with history. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed various problems surfaced by trybots. Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/download/download_item_gtk.h" 5 #include "chrome/browser/ui/gtk/download/download_item_gtk.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/string_util.h" 10 #include "base/string_util.h"
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 void DownloadItemGtk::OnDangerousAccept(GtkWidget* button) { 860 void DownloadItemGtk::OnDangerousAccept(GtkWidget* button) {
861 UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download", 861 UMA_HISTOGRAM_LONG_TIMES("clickjacking.save_download",
862 base::Time::Now() - creation_time_); 862 base::Time::Now() - creation_time_);
863 get_download()->DangerousDownloadValidated(); 863 get_download()->DangerousDownloadValidated();
864 } 864 }
865 865
866 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) { 866 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
867 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", 867 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
868 base::Time::Now() - creation_time_); 868 base::Time::Now() - creation_time_);
869 if (get_download()->IsPartialDownload()) 869 if (get_download()->IsPartialDownload())
870 get_download()->Cancel(true); 870 get_download()->Cancel();
871 get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD); 871 get_download()->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
872 } 872 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698