Opt out of download feedback from settings

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 539 matching lines @@
   // WARNING: all end states after this point delete |this|.
   DCHECK_EQ(discard_button_, sender);
   if (model_.IsMalicious()) {
     UMA_HISTOGRAM_LONG_TIMES("clickjacking.dismiss_download", warning_duration);
     shelf_->RemoveDownloadView(this);
     return;
   }
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download", warning_duration);
   if (model_.ShouldAllowDownloadFeedback() &&
       !shelf_->browser()->profile()->IsOffTheRecord()) {
-    DownloadFeedbackDialogView::DownloadReportingStatus pref_value =
-        static_cast<DownloadFeedbackDialogView::DownloadReportingStatus>(
-            shelf_->browser()->profile()->GetPrefs()->GetInteger(
-                prefs::kSafeBrowsingDownloadReportingEnabled));
-    switch (pref_value) {
-      case DownloadFeedbackDialogView::kDialogNotYetShown:
-        DownloadFeedbackDialogView::Show(
-            shelf_->get_parent()->GetNativeWindow(),
-            shelf_->browser()->profile(),
-            base::Bind(
-                &DownloadItemView::PossiblySubmitDownloadToFeedbackService,
-                weak_ptr_factory_.GetWeakPtr()));
-        break;
-
-      case DownloadFeedbackDialogView::kDownloadReportingEnabled:
-      case DownloadFeedbackDialogView::kDownloadReportingDisabled:
-        PossiblySubmitDownloadToFeedbackService(pref_value);
-        break;
-
-      case DownloadFeedbackDialogView::kMaxValue:
-        NOTREACHED();
+    if (!shelf_->browser()->profile()->GetPrefs()->HasPrefPath(
+        prefs::kSafeBrowsingDownloadFeedbackEnabled)) {
+      // Show dialog, because the dialog hasn't been shown before.
+      DownloadFeedbackDialogView::Show(
+          shelf_->get_parent()->GetNativeWindow(),
+          shelf_->browser()->profile(),
+          base::Bind(
+              &DownloadItemView::PossiblySubmitDownloadToFeedbackService,
+              weak_ptr_factory_.GetWeakPtr()));
+    } else {
+      PossiblySubmitDownloadToFeedbackService(
+          shelf_->browser()->profile()->GetPrefs()->GetBoolean(
+               prefs::kSafeBrowsingDownloadFeedbackEnabled));
     }
     return;
   }
   download()->Remove();
 }
 
 void DownloadItemView::AnimationProgressed(const gfx::Animation* animation) {
   // We don't care if what animation (body button/drop button/complete),
   // is calling back, as they all have to go through the same paint call.
   SchedulePaint();
@@ skipping 339 matching lines @@
   download_protection_service->feedback_service()->BeginFeedbackForDownload(
       download());
   // WARNING: we are deleted at this point.  Don't access 'this'.
   return true;
 #else
   NOTREACHED();
   return false;
 #endif
 }
 
-void DownloadItemView::PossiblySubmitDownloadToFeedbackService(
-    DownloadFeedbackDialogView::DownloadReportingStatus status) {
-  if (status != DownloadFeedbackDialogView::kDownloadReportingEnabled ||
-      !SubmitDownloadToFeedbackService()) {
+void DownloadItemView::PossiblySubmitDownloadToFeedbackService(bool enabled) {
+  if (!enabled || !SubmitDownloadToFeedbackService())
     download()->Remove();
-  }
   // WARNING: 'this' is deleted at this point. Don't access 'this'.
 }
 
 void DownloadItemView::LoadIcon() {
   IconManager* im = g_browser_process->icon_manager();
   last_download_item_path_ = download()->GetTargetFilePath();
   im->LoadIcon(last_download_item_path_,
                IconLoader::SMALL,
                base::Bind(&DownloadItemView::OnExtractIconComplete,
                           base::Unretained(this)),
@@ skipping 393 matching lines @@
 void DownloadItemView::AnimateStateTransition(State from, State to,
                                               gfx::SlideAnimation* animation) {
   if (from == NORMAL && to == HOT) {
     animation->Show();
   } else if (from == HOT && to == NORMAL) {
     animation->Hide();
   } else if (from != to) {
     animation->Reset((to == HOT) ? 1.0 : 0.0);
   }
 }