For downloads requiring a user gesture, also require...

chrome/browser/download/download_item.cc

 // Copyright (c) 2011 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/download/download_item.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 75 matching lines @@
     case DownloadItem::REMOVING:
       return "REMOVING";
     case DownloadItem::INTERRUPTED:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
       return "unknown";
   };
 }
 
-DownloadItem::SafetyState GetSafetyState(bool dangerous_file,
-                                         bool dangerous_url) {
-  return (dangerous_url || dangerous_file) ?
+DownloadItem::SafetyState GetSafetyState(
+    bool dangerous_file,
+    DownloadStateInfo::Tristate dangerous_url) {
+  return ((dangerous_url == DownloadStateInfo::YES) || dangerous_file) ?
       DownloadItem::DANGEROUS : DownloadItem::SAFE;
 }
 
 // Note: When a download has both |dangerous_file| and |dangerous_url| set,
 // danger type is set to DANGEROUS_URL since the risk of dangerous URL
 // overweights that of dangerous file type.
-DownloadItem::DangerType GetDangerType(bool dangerous_file,
-                                       bool dangerous_url) {
-  if (dangerous_url) {
+DownloadItem::DangerType GetDangerType(
+    bool dangerous_file,
+    DownloadStateInfo::Tristate dangerous_url) {
+  if (dangerous_url == DownloadStateInfo::YES) {
     // dangerous URL overweights dangerous file. We check dangerous URL first.
     return DownloadItem::DANGEROUS_URL;
   }
   return dangerous_file ?
       DownloadItem::DANGEROUS_FILE : DownloadItem::NOT_DANGEROUS;
 }
 
 }  // namespace
 
 // Constructor for reading from the history service.
@@ skipping 24 matching lines @@
     all_data_saved_ = true;
   Init(false /* don't start progress timer */);
 }
 
 // Constructing for a regular download:
 DownloadItem::DownloadItem(DownloadManager* download_manager,
                            const DownloadCreateInfo& info,
                            bool is_otr)
     : state_info_(info.original_name, info.save_info.file_path,
                   info.has_user_gesture, info.prompt_user_for_save_location,
-                  info.path_uniquifier, info.is_dangerous_file,
-                  info.is_dangerous_url, info.is_extension_install),
+                  info.path_uniquifier, false, DownloadStateInfo::UNKNOWN,
+                  DownloadStateInfo::UNKNOWN, info.is_extension_install),
       process_handle_(info.process_handle),
       download_id_(info.download_id),
       full_path_(info.path),
       url_chain_(info.url_chain),
       referrer_url_(info.referrer_url),
       content_disposition_(info.content_disposition),
       mime_type_(info.mime_type),
       original_mime_type_(info.original_mime_type),
       referrer_charset_(info.referrer_charset),
       total_bytes_(info.total_bytes),
       received_bytes_(0),
       last_os_error_(0),
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       start_time_(info.start_time),
       db_handle_(DownloadHistory::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
-      safety_state_(GetSafetyState(info.is_dangerous_file,
-                                   info.is_dangerous_url)),
+      safety_state_(SAFE),
       auto_opened_(false),
       is_otr_(is_otr),
       is_temporary_(!info.save_info.file_path.empty()),
       all_data_saved_(false),
       opened_(false) {
   Init(true /* start progress timer */);
 }
 
 // Constructing for the "Save Page As..." feature:
 DownloadItem::DownloadItem(DownloadManager* download_manager,
@@ skipping 349 matching lines @@
 
 DownloadItem::DangerType DownloadItem::GetDangerType() const {
   return ::GetDangerType(state_info_.is_dangerous_file,
                          state_info_.is_dangerous_url);
 }
 
 bool DownloadItem::IsDangerous() const {
   return GetDangerType() != DownloadItem::NOT_DANGEROUS;
 }
 
-void DownloadItem::MarkUrlDangerous() {
-  state_info_.is_dangerous_url = true;
+void DownloadItem::SetFileDangerous(bool dangerous) {
+  state_info_.is_dangerous_file = dangerous;
+}
+
+void DownloadItem::SetUrlDangerous(bool dangerous) {
+  state_info_.is_dangerous_url =
+      dangerous ? DownloadStateInfo::YES : DownloadStateInfo::NO;
+}
+
+void DownloadItem::SetVisitedBefore(bool visited_referrer_before) {
+  state_info_.visited_referrer_before =
+      visited_referrer_before ? DownloadStateInfo::YES : DownloadStateInfo::NO;
 }
 
 DownloadHistoryInfo DownloadItem::GetHistoryInfo() const {
   return DownloadHistoryInfo(full_path(),
                              GetURL(),
                              referrer_url(),
                              start_time(),
                              received_bytes(),
                              total_bytes(),
                              state(),
@@ skipping 95 matching lines @@
         state_info_.target_name.value().c_str(),
         full_path().value().c_str());
   } else {
     description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
 
   description += " }";
 
   return description;
 }