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

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

Issue 2965015: Attempt four at landing the "histogram.h removed from message_loop.h" patch. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: win build fixes Created 10 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
« no previous file with comments | « chrome/browser/google_url_tracker.h ('k') | chrome/browser/idle.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/gtk/download_item_gtk.h" 5 #include "chrome/browser/gtk/download_item_gtk.h"
6 6
7 #include "app/gtk_util.h" 7 #include "app/gtk_util.h"
8 #include "app/l10n_util.h" 8 #include "app/l10n_util.h"
9 #include "app/menus/simple_menu_model.h" 9 #include "app/menus/simple_menu_model.h"
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "app/slide_animation.h" 11 #include "app/slide_animation.h"
12 #include "app/text_elider.h" 12 #include "app/text_elider.h"
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/callback.h" 14 #include "base/callback.h"
15 #include "base/histogram.h"
15 #include "base/string_util.h" 16 #include "base/string_util.h"
16 #include "base/time.h" 17 #include "base/time.h"
17 #include "chrome/browser/browser.h" 18 #include "chrome/browser/browser.h"
18 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/download/download_item_model.h" 20 #include "chrome/browser/download/download_item_model.h"
20 #include "chrome/browser/download/download_manager.h" 21 #include "chrome/browser/download/download_manager.h"
21 #include "chrome/browser/download/download_shelf.h" 22 #include "chrome/browser/download/download_shelf.h"
22 #include "chrome/browser/download/download_util.h" 23 #include "chrome/browser/download/download_util.h"
23 #include "chrome/browser/gtk/custom_drag.h" 24 #include "chrome/browser/gtk/custom_drag.h"
24 #include "chrome/browser/gtk/download_shelf_gtk.h" 25 #include "chrome/browser/gtk/download_shelf_gtk.h"
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 get_download()->manager()->DangerousDownloadValidated(get_download()); 856 get_download()->manager()->DangerousDownloadValidated(get_download());
856 } 857 }
857 858
858 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) { 859 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button) {
859 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", 860 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
860 base::Time::Now() - creation_time_); 861 base::Time::Now() - creation_time_);
861 if (get_download()->state() == DownloadItem::IN_PROGRESS) 862 if (get_download()->state() == DownloadItem::IN_PROGRESS)
862 get_download()->Cancel(true); 863 get_download()->Cancel(true);
863 get_download()->Remove(true); 864 get_download()->Remove(true);
864 } 865 }
OLDNEW
« no previous file with comments | « chrome/browser/google_url_tracker.h ('k') | chrome/browser/idle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698