Move DownloadDangerType to its own file.

BUG=98716
Review URL: https://chromiumcodereview.appspot.com/9141031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118852 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 11 deletions

diff --git a/content/browser/download/download_state_info.cc b/content/browser/download/download_state_info.cc
index 832753d..dd26812 100644
--- a/content/browser/download/download_state_info.cc
+++ b/content/browser/download/download_state_info.cc
@@ -11,7 +11,7 @@ DownloadStateInfo::DownloadStateInfo()
       has_user_gesture(false),
       transition_type(content::PAGE_TRANSITION_LINK),
       prompt_user_for_save_location(false),
-      danger(NOT_DANGEROUS) {
+      danger(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) {
 }
 
 DownloadStateInfo::DownloadStateInfo(
@@ -21,7 +21,7 @@ DownloadStateInfo::DownloadStateInfo(
       has_user_gesture(has_user_gesture),
       transition_type(content::PAGE_TRANSITION_LINK),
       prompt_user_for_save_location(prompt_user_for_save_location),
-      danger(NOT_DANGEROUS) {
+      danger(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) {
 }
 
 DownloadStateInfo::DownloadStateInfo(
@@ -29,15 +29,13 @@ DownloadStateInfo::DownloadStateInfo(
     const FilePath& forced_name,
     bool has_user_gesture,
     content::PageTransition transition_type,
-    bool prompt_user_for_save_location,
-    int uniquifier,
-    DangerType danger_type)
+    bool prompt_user_for_save_location)
     : target_name(target),
-      path_uniquifier(uniquifier),
+      path_uniquifier(0),
       has_user_gesture(has_user_gesture),
       transition_type(transition_type),
       prompt_user_for_save_location(prompt_user_for_save_location),
-      danger(danger_type),
+      danger(content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
       force_file_name(forced_name) {
 }
 
@@ -45,10 +43,11 @@ bool DownloadStateInfo::IsDangerous() const {
   // TODO(noelutz): At this point only the windows views UI supports
   // warnings based on dangerous content.
 #ifdef OS_WIN
-  return (danger == DANGEROUS_FILE ||
-          danger == DANGEROUS_URL ||
-          danger == DANGEROUS_CONTENT);
+  return (danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
+          danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ||
+          danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT);
 #else
-  return (danger == DANGEROUS_FILE || danger == DANGEROUS_URL);
+  return (danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE ||
+          danger == content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL);
 #endif
 }