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

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: Move the UserData check into the dialog itself 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 "chrome/browser/browser_process.h" 20 #include "chrome/browser/browser_process.h"
21 #include "chrome/browser/download/chrome_download_manager_delegate.h" 21 #include "chrome/browser/download/chrome_download_manager_delegate.h"
22 #include "chrome/browser/download/download_item_model.h" 22 #include "chrome/browser/download/download_item_model.h"
23 #include "chrome/browser/download/download_stats.h" 23 #include "chrome/browser/download/download_stats.h"
24 #include "chrome/browser/download/drag_download_item.h" 24 #include "chrome/browser/download/drag_download_item.h"
25 #include "chrome/browser/prefs/pref_service_syncable.h"
mattm 2014/02/07 02:03:36 Can these includes just be base/prefs/pref_service
felt 2014/02/07 05:27:50 Done.
25 #include "chrome/browser/safe_browsing/download_feedback_service.h" 26 #include "chrome/browser/safe_browsing/download_feedback_service.h"
26 #include "chrome/browser/safe_browsing/download_protection_service.h" 27 #include "chrome/browser/safe_browsing/download_protection_service.h"
27 #include "chrome/browser/safe_browsing/safe_browsing_service.h" 28 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
28 #include "chrome/browser/themes/theme_properties.h" 29 #include "chrome/browser/themes/theme_properties.h"
30 #include "chrome/browser/ui/views/download/download_feedback_dialog_view.h"
29 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h" 31 #include "chrome/browser/ui/views/download/download_shelf_context_menu_view.h"
30 #include "chrome/browser/ui/views/download/download_shelf_view.h" 32 #include "chrome/browser/ui/views/download/download_shelf_view.h"
31 #include "content/public/browser/download_danger_type.h" 33 #include "content/public/browser/download_danger_type.h"
32 #include "grit/generated_resources.h" 34 #include "grit/generated_resources.h"
33 #include "grit/theme_resources.h" 35 #include "grit/theme_resources.h"
34 #include "third_party/icu/source/common/unicode/uchar.h" 36 #include "third_party/icu/source/common/unicode/uchar.h"
35 #include "ui/base/accessibility/accessible_view_state.h" 37 #include "ui/base/accessibility/accessible_view_state.h"
36 #include "ui/base/l10n/l10n_util.h" 38 #include "ui/base/l10n/l10n_util.h"
37 #include "ui/base/resource/resource_bundle.h" 39 #include "ui/base/resource/resource_bundle.h"
38 #include "ui/base/theme_provider.h" 40 #include "ui/base/theme_provider.h"
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 return; 545 return;
544 } 546 }
545 547
546 // WARNING: all end states after this point delete |this|. 548 // WARNING: all end states after this point delete |this|.
547 DCHECK_EQ(discard_button_, sender); 549 DCHECK_EQ(discard_button_, sender);
548 if (model_.IsMalicious()) { 550 if (model_.IsMalicious()) {
549 UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration); 551 UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration);
550 shelf_->RemoveDownloadView(this); 552 shelf_->RemoveDownloadView(this);
551 return; 553 return;
552 } 554 }
553 if (model_.ShouldAllowDownloadFeedback() && BeginDownloadFeedback()) 555 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration);
556 if (model_.ShouldAllowDownloadFeedback() &&
557 !shelf_->browser()->profile()->IsOffTheRecord()) {
558 DownloadFeedbackDialogView::DownloadReportingStatus pref_value =
559 static_cast<DownloadFeedbackDialogView::DownloadReportingStatus>(
560 shelf_->browser()->profile()->GetPrefs()->GetInteger(
561 prefs::kSafeBrowsingDownloadReportingEnabled));
562 switch (pref_value) {
563 case DownloadFeedbackDialogView::kDialogNotYetShown:
564 DownloadFeedbackDialogView::Show(
565 shelf_->get_parent()->GetNativeWindow(),
566 shelf_->browser()->profile(),
567 base::Bind(
568 &DownloadItemView::PossiblySubmitDownloadToFeedbackService,
569 weak_ptr_factory_.GetWeakPtr()));
570 break;
571
572 case DownloadFeedbackDialogView::kDownloadReportingEnabled:
573 case DownloadFeedbackDialogView::kDownloadReportingDisabled:
574 PossiblySubmitDownloadToFeedbackService(pref_value);
575 break;
576
577 case DownloadFeedbackDialogView::kMaxValue:
578 NOTREACHED();
579 }
554 return; 580 return;
555 UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration); 581 }
556 download()->Remove(); 582 download()->Remove();
557 } 583 }
558 584
559 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) { 585 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) {
560 // We don't care if what animation (body button/drop button/complete), 586 // 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. 587 // is calling back, as they all have to go through the same paint call.
562 SchedulePaint(); 588 SchedulePaint();
563 } 589 }
564 590
565 void DownloadItemView::OnPaint(gfx::Canvas* canvas) { 591 void DownloadItemView::OnPaint(gfx::Canvas* canvas) {
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
883 void DownloadItemView::OpenDownload() { 909 void DownloadItemView::OpenDownload() {
884 DCHECK(!IsShowingWarningDialog()); 910 DCHECK(!IsShowingWarningDialog());
885 // We're interested in how long it takes users to open downloads. If they 911 // 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. 912 // open downloads super quickly, we should be concerned about clickjacking.
887 UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download", 913 UMA_HISTOGRAM_LONG_TIMES("clickjacking.open_download",
888 base::Time::Now() - creation_time_); 914 base::Time::Now() - creation_time_);
889 download()->OpenDownload(); 915 download()->OpenDownload();
890 UpdateAccessibleName(); 916 UpdateAccessibleName();
891 } 917 }
892 918
893 bool DownloadItemView::BeginDownloadFeedback() { 919 bool DownloadItemView::SubmitDownloadToFeedbackService() {
894 #if defined(FULL_SAFE_BROWSING) 920 #if defined(FULL_SAFE_BROWSING)
895 SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service(); 921 SafeBrowsingService* sb_service = g_browser_process->safe_browsing_service();
896 if (!sb_service) 922 if (!sb_service)
897 return false; 923 return false;
898 safe_browsing::DownloadProtectionService* download_protection_service = 924 safe_browsing::DownloadProtectionService* download_protection_service =
899 sb_service->download_protection_service(); 925 sb_service->download_protection_service();
900 if (!download_protection_service) 926 if (!download_protection_service)
901 return false; 927 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( 928 download_protection_service->feedback_service()->BeginFeedbackForDownload(
908 download()); 929 download());
909 // WARNING: we are deleted at this point. Don't access 'this'. 930 // WARNING: we are deleted at this point. Don't access 'this'.
910 return true; 931 return true;
911 #else 932 #else
912 NOTREACHED(); 933 NOTREACHED();
913 return false; 934 return false;
914 #endif 935 #endif
915 } 936 }
916 937
938 void DownloadItemView::PossiblySubmitDownloadToFeedbackService(
939 DownloadFeedbackDialogView::DownloadReportingStatus status) {
940 if (status != DownloadFeedbackDialogView::kDownloadReportingEnabled ||
941 !SubmitDownloadToFeedbackService()) {
942 download()->Remove();
943 }
944 // WARNING: 'this' is deleted at this point. Don't access 'this'.
945 }
946
917 void DownloadItemView::LoadIcon() { 947 void DownloadItemView::LoadIcon() {
918 IconManager* im = g_browser_process->icon_manager(); 948 IconManager* im = g_browser_process->icon_manager();
919 last_download_item_path_ = download()->GetTargetFilePath(); 949 last_download_item_path_ = download()->GetTargetFilePath();
920 im->LoadIcon(last_download_item_path_, 950 im->LoadIcon(last_download_item_path_,
921 IconLoader::SMALL, 951 IconLoader::SMALL,
922 base::Bind(&DownloadItemView::OnExtractIconComplete, 952 base::Bind(&DownloadItemView::OnExtractIconComplete,
923 base::Unretained(this)), 953 base::Unretained(this)),
924 &cancelable_task_tracker_); 954 &cancelable_task_tracker_);
925 } 955 }
926 956
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 body_state_ = NORMAL; 1164 body_state_ = NORMAL;
1135 drop_down_state_ = NORMAL; 1165 drop_down_state_ = NORMAL;
1136 if (mode_ == DANGEROUS_MODE) { 1166 if (mode_ == DANGEROUS_MODE) {
1137 save_button_ = new views::LabelButton( 1167 save_button_ = new views::LabelButton(
1138 this, model_.GetWarningConfirmButtonText()); 1168 this, model_.GetWarningConfirmButtonText());
1139 save_button_->SetStyle(views::Button::STYLE_BUTTON); 1169 save_button_->SetStyle(views::Button::STYLE_BUTTON);
1140 AddChildView(save_button_); 1170 AddChildView(save_button_);
1141 } 1171 }
1142 int discard_button_message = model_.IsMalicious() ? 1172 int discard_button_message = model_.IsMalicious() ?
1143 IDS_DISMISS_DOWNLOAD : IDS_DISCARD_DOWNLOAD; 1173 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( 1174 discard_button_ = new views::LabelButton(
1147 this, l10n_util::GetStringUTF16(discard_button_message)); 1175 this, l10n_util::GetStringUTF16(discard_button_message));
1148 discard_button_->SetStyle(views::Button::STYLE_BUTTON); 1176 discard_button_->SetStyle(views::Button::STYLE_BUTTON);
1149 AddChildView(discard_button_); 1177 AddChildView(discard_button_);
1150 1178
1151 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 1179 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
1152 switch (danger_type) { 1180 switch (danger_type) {
1153 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL: 1181 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
1154 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT: 1182 case content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
1155 case content::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT: 1183 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, 1347 void DownloadItemView::AnimateStateTransition(State from, State to,
1320 gfx::SlideAnimation* animation) { 1348 gfx::SlideAnimation* animation) {
1321 if (from == NORMAL && to == HOT) { 1349 if (from == NORMAL && to == HOT) {
1322 animation->Show(); 1350 animation->Show();
1323 } else if (from == HOT && to == NORMAL) { 1351 } else if (from == HOT && to == NORMAL) {
1324 animation->Hide(); 1352 animation->Hide();
1325 } else if (from != to) { 1353 } else if (from != to) {
1326 animation->Reset((to == HOT) ? 1.0 : 0.0); 1354 animation->Reset((to == HOT) ? 1.0 : 0.0);
1327 } 1355 }
1328 } 1356 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698