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

Side by Side Diff: chrome/browser/ui/views/download/download_item_view.cc

Issue 147593002: Implement new dangerous download reporting dialog for UNCOMMON_DOWNLOAD, in Views (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Improved DialogStatusData Created 6 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/views/download/download_item_view.h" 5 #include "chrome/browser/ui/views/download/download_item_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/i18n/break_iterator.h" 13 #include "base/i18n/break_iterator.h"
14 #include "base/i18n/rtl.h" 14 #include "base/i18n/rtl.h"
15 #include "base/metrics/histogram.h" 15 #include "base/metrics/histogram.h"
16 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
17 #include "base/strings/stringprintf.h" 17 #include "base/strings/stringprintf.h"
18 #include "base/strings/sys_string_conversions.h" 18 #include "base/strings/sys_string_conversions.h"
19 #include "base/strings/utf_string_conversions.h" 19 #include "base/strings/utf_string_conversions.h"
20 #include "base/supports_user_data.h"
20 #include "chrome/browser/browser_process.h" 21 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/download/chrome_download_manager_delegate.h" 22 #include "chrome/browser/download/chrome_download_manager_delegate.h"
22 #include "chrome/browser/download/download_item_model.h" 23 #include "chrome/browser/download/download_item_model.h"
23 #include "chrome/browser/download/download_stats.h" 24 #include "chrome/browser/download/download_stats.h"
24 #include "chrome/browser/download/drag_download_item.h" 25 #include "chrome/browser/download/drag_download_item.h"
26 #include "chrome/browser/prefs/pref_service_syncable.h"
25 #include "chrome/browser/safe_browsing/download_feedback_service.h" 27 #include "chrome/browser/safe_browsing/download_feedback_service.h"
26 #include "chrome/browser/safe_browsing/download_protection_service.h" 28 #include "chrome/browser/safe_browsing/download_protection_service.h"
27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 29 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
28 #include "chrome/browser/themes/theme_properties.h" 30 #include "chrome/browser/themes/theme_properties.h"
31 #include "chrome/browser/ui/views/download/download_feedback_dialog_view.h"
29 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h" 32 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
30 #include "chrome/browser/ui/views/download/download_shelf_view.h" 33 #include "chrome/browser/ui/views/download/download_shelf_view.h"
31 #include "content/public/browser/download_danger_type.h" 34 #include "content/public/browser/download_danger_type.h"
32 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 36 #include "grit/theme_resources.h"
34 #include "third_party/icu/source/common/unicode/uchar.h" 37 #include "third_party/icu/source/common/unicode/uchar.h"
35 #include "ui/base/accessibility/accessible_view_state.h" 38 #include "ui/base/accessibility/accessible_view_state.h"
36 #include "ui/base/l10n/l10n_util.h" 39 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/resource/resource_bundle.h" 40 #include "ui/base/resource/resource_bundle.h"
38 #include "ui/base/theme_provider.h" 41 #include "ui/base/theme_provider.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 // downloaded item. 84 // downloaded item.
82 static const int kDisabledOnOpenDuration = 3000; 85 static const int kDisabledOnOpenDuration = 3000;
83 86
84 // Darken light-on-dark download status text by 20% before drawing, thus 87 // Darken light-on-dark download status text by 20% before drawing, thus
85 // creating a "muted" version of title text for both dark-on-light and 88 // creating a "muted" version of title text for both dark-on-light and
86 // light-on-dark themes. 89 // light-on-dark themes.
87 static const double kDownloadItemLuminanceMod = 0.8; 90 static const double kDownloadItemLuminanceMod = 0.8;
88 91
89 using content::DownloadItem; 92 using content::DownloadItem;
90 93
94 const void* kDialogStatusKey = &kDialogStatusKey;
95
96 class DialogStatusData : public base::SupportsUserData::Data {
97 public:
98 DialogStatusData() : currently_shown_(false) {}
99 virtual ~DialogStatusData() {}
100 bool currently_shown() { return currently_shown_; }
mattm 2014/02/06 03:35:22 should be const method
felt 2014/02/06 23:10:22 Done.
101 void currently_shown(bool shown) { currently_shown_ = shown; }
mattm 2014/02/06 03:35:22 set_currently_shown
felt 2014/02/06 23:10:22 Done.
102 private:
103 bool currently_shown_;
104 };
105
91 DownloadItemView::DownloadItemView(DownloadItem* download_item, 106 DownloadItemView::DownloadItemView(DownloadItem* download_item,
92 DownloadShelfView* parent) 107 DownloadShelfView* parent)
93 : warning_icon_(NULL), 108 : warning_icon_(NULL),
94 shelf_(parent), 109 shelf_(parent),
95 status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)), 110 status_text_(l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_STARTING)),
96 body_state_(NORMAL), 111 body_state_(NORMAL),
97 drop_down_state_(NORMAL), 112 drop_down_state_(NORMAL),
98 mode_(NORMAL_MODE), 113 mode_(NORMAL_MODE),
99 progress_angle_(DownloadShelf::kStartAngleDegrees), 114 progress_angle_(DownloadShelf::kStartAngleDegrees),
100 drop_down_pressed_(false), 115 drop_down_pressed_(false),
(...skipping 442 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 return; 558 return;
544 } 559 }
545 560
546 // WARNING: all end states after this point delete |this|. 561 // WARNING: all end states after this point delete |this|.
547 DCHECK_EQ(discard_button_, sender); 562 DCHECK_EQ(discard_button_, sender);
548 if (model_.IsMalicious()) { 563 if (model_.IsMalicious()) {
549 UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration); 564 UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration);
550 shelf_->RemoveDownloadView(this); 565 shelf_->RemoveDownloadView(this);
551 return; 566 return;
552 } 567 }
553 if (model_.ShouldAllowDownloadFeedback() && BeginDownloadFeedback()) 568 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration);
569 if (model_.ShouldAllowDownloadFeedback()) {
570 DownloadFeedbackDialogView::DownloadReportingStatus pref_value =
571 static_cast<DownloadFeedbackDialogView::DownloadReportingStatus>(
572 shelf_->browser()->profile()->GetPrefs()->GetInteger(
573 prefs::kSafeBrowsingDownloadReportingEnabled));
574 DialogStatusData* data = static_cast<DialogStatusData*>(
575 shelf_->browser()->profile()->GetUserData(kDialogStatusKey));
576 switch (pref_value) {
577 case DownloadFeedbackDialogView::kDialogNotYetShown:
578 // Need to check if the dialog is already displayed for this profile.
579 // If it is, default to discarding the file and don't generate a second
580 // instance of the dialog.
581 if (data == NULL) {
582 data = new DialogStatusData();
583 shelf_->browser()->profile()->SetUserData(kDialogStatusKey, data);
584 }
585 if (data->currently_shown() == false) {
586 data->currently_shown(true);
587 DownloadFeedbackDialogView::Show(
588 shelf_->get_parent()->GetNativeWindow(),
589 shelf_->browser()->profile(),
590 base::Bind(
591 &DownloadItemView::PossiblySubmitDownloadToFeedbackService,
592 weak_ptr_factory_.GetWeakPtr()));
593 } else {
594 PossiblySubmitDownloadToFeedbackService(
595 DownloadFeedbackDialogView::kDownloadReportingDisabled);
596 }
597 break;
598
599 case DownloadFeedbackDialogView::kDownloadReportingEnabled:
600 case DownloadFeedbackDialogView::kDownloadReportingDisabled:
601 PossiblySubmitDownloadToFeedbackService(pref_value);
602 break;
603
604 case DownloadFeedbackDialogView::kMaxValue:
605 NOTREACHED();
606 }
554 return; 607 return;
555 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration); 608 }
556 download()->Remove(); 609 download()->Remove();
557 } 610 }
558 611
559 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) { 612 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) {
560 // We don't care if what animation (body button/drop button/complete), 613 // We don't care if what animation (body button/drop button/complete),
561 // is calling back, as they all have to go through the same paint call. 614 // is calling back, as they all have to go through the same paint call.
562 SchedulePaint(); 615 SchedulePaint();
563 } 616 }
564 617
565 void DownloadItemView::OnPaint(gfx::Canvas* canvas) { 618 void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 void DownloadItemView::OpenDownload() { 936 void DownloadItemView::OpenDownload() {
884 DCHECK(!IsShowingWarningDialog()); 937 DCHECK(!IsShowingWarningDialog());
885 // We're interested in how long it takes users to open downloads. If they 938 // We're interested in how long it takes users to open downloads. If they
886 // open downloads super quickly, we should be concerned about clickjacking. 939 // open downloads super quickly, we should be concerned about clickjacking.
887 UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download", 940 UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
888 base::Time::Now() - creation_time_); 941 base::Time::Now() - creation_time_);
889 download()->OpenDownload(); 942 download()->OpenDownload();
890 UpdateAccessibleName(); 943 UpdateAccessibleName();
891 } 944 }
892 945
893 bool DownloadItemView::BeginDownloadFeedback() { 946 bool DownloadItemView::SubmitDownloadToFeedbackService() {
894 #if defined(FULL_SAFE_BROWSING) 947 #if defined(FULL_SAFE_BROWSING)
895 SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); 948 SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
896 if (!sb_service) 949 if (!sb_service)
897 return false; 950 return false;
898 safe_browsing::DownloadProtectionService* download_protection_service = 951 safe_browsing::DownloadProtectionService* download_protection_service =
899 sb_service->download_protection_service(); 952 sb_service->download_protection_service();
900 if (!download_protection_service) 953 if (!download_protection_service)
901 return false; 954 return false;
902 base::TimeDelta warning_duration = base::TimeDelta();
903 if (!time_download_warning_shown_.is_null())
904 warning_duration = base::Time::Now() - time_download_warning_shown_;
905 UMA_HISTOGRAM_LONG_TIMES("clickjacking.report_and_discard_download",
906 warning_duration);
907 download_protection_service->feedback_service()->BeginFeedbackForDownload( 955 download_protection_service->feedback_service()->BeginFeedbackForDownload(
908 download()); 956 download());
909 // WARNING: we are deleted at this point. Don't access 'this'. 957 // WARNING: we are deleted at this point. Don't access 'this'.
910 return true; 958 return true;
911 #else 959 #else
912 NOTREACHED(); 960 NOTREACHED();
913 return false; 961 return false;
914 #endif 962 #endif
915 } 963 }
916 964
965 void DownloadItemView::PossiblySubmitDownloadToFeedbackService(
966 DownloadFeedbackDialogView::DownloadReportingStatus status) {
967 DialogStatusData* data = static_cast<DialogStatusData*>(
968 shelf_->browser()->profile()->GetUserData(kDialogStatusKey));
969 DCHECK(data);
970 data->currently_shown(false);
971
972 if (status != DownloadFeedbackDialogView::kDownloadReportingEnabled ||
973 !SubmitDownloadToFeedbackService()) {
974 download()->Remove();
975 }
976 // WARNING: 'this' is deleted at this point. Don't access 'this'.
977 }
978
917 void DownloadItemView::LoadIcon() { 979 void DownloadItemView::LoadIcon() {
918 IconManager* im = g_browser_process->icon_manager(); 980 IconManager* im = g_browser_process->icon_manager();
919 last_download_item_path_ = download()->GetTargetFilePath(); 981 last_download_item_path_ = download()->GetTargetFilePath();
920 im->LoadIcon(last_download_item_path_, 982 im->LoadIcon(last_download_item_path_,
921 IconLoader::SMALL, 983 IconLoader::SMALL,
922 base::Bind(&DownloadItemView::OnExtractIconComplete, 984 base::Bind(&DownloadItemView::OnExtractIconComplete,
923 base::Unretained(this)), 985 base::Unretained(this)),
924 &cancelable_task_tracker_); 986 &cancelable_task_tracker_);
925 } 987 }
926 988
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 body_state_ = NORMAL; 1196 body_state_ = NORMAL;
1135 drop_down_state_ = NORMAL; 1197 drop_down_state_ = NORMAL;
1136 if (mode_ == DANGEROUS_MODE) { 1198 if (mode_ == DANGEROUS_MODE) {
1137 save_button_ = new views::LabelButton( 1199 save_button_ = new views::LabelButton(
1138 this, model_.GetWarningConfirmButtonText()); 1200 this, model_.GetWarningConfirmButtonText());
1139 save_button_->SetStyle(views::Button::STYLE_BUTTON); 1201 save_button_->SetStyle(views::Button::STYLE_BUTTON);
1140 AddChildView(save_button_); 1202 AddChildView(save_button_);
1141 } 1203 }
1142 int discard_button_message = model_.IsMalicious() ? 1204 int discard_button_message = model_.IsMalicious() ?
1143 IDS_DISMISS_DOWNLOAD : IDS_DISCARD_DOWNLOAD; 1205 IDS_DISMISS_DOWNLOAD : IDS_DISCARD_DOWNLOAD;
1144 if (!model_.IsMalicious() && model_.ShouldAllowDownloadFeedback())
1145 discard_button_message = IDS_REPORT_AND_DISCARD_DOWNLOAD;
1146 discard_button_ = new views::LabelButton( 1206 discard_button_ = new views::LabelButton(
1147 this, l10n_util::GetStringUTF16(discard_button_message)); 1207 this, l10n_util::GetStringUTF16(discard_button_message));
1148 discard_button_->SetStyle(views::Button::STYLE_BUTTON); 1208 discard_button_->SetStyle(views::Button::STYLE_BUTTON);
1149 AddChildView(discard_button_); 1209 AddChildView(discard_button_);
1150 1210
1151 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 1211 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
1152 switch (danger_type) { 1212 switch (danger_type) {
1153 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL: 1213 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
1154 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT: 1214 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
1155 case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: 1215 case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1319 void DownloadItemView::AnimateStateTransition(State from, State to, 1379 void DownloadItemView::AnimateStateTransition(State from, State to,
1320 gfx::SlideAnimation* animation) { 1380 gfx::SlideAnimation* animation) {
1321 if (from == NORMAL && to == HOT) { 1381 if (from == NORMAL && to == HOT) {
1322 animation->Show(); 1382 animation->Show();
1323 } else if (from == HOT && to == NORMAL) { 1383 } else if (from == HOT && to == NORMAL) {
1324 animation->Hide(); 1384 animation->Hide();
1325 } else if (from != to) { 1385 } else if (from != to) {
1326 animation->Reset((to == HOT) ? 1.0 : 0.0); 1386 animation->Reset((to == HOT) ? 1.0 : 0.0);
1327 } 1387 }
1328 } 1388 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/download/download_item_view.h ('k') | chrome/browser/ui/views/download/download_shelf_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698