diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 17:24:38 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 17:24:38 +0000 |
commit | a62d42908f4fcb66a60808025435ecd67b89cf0a (patch) | |
tree | eefa595673e6ddc566f0b2078352b005e35561c9 /chrome/browser/ui/gtk/download/download_item_gtk.cc | |
parent | 3d0824177f14eba2dbc775dc35ea9c5a5cac1f0f (diff) | |
download | chromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.zip chromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.tar.gz chromium_src-a62d42908f4fcb66a60808025435ecd67b89cf0a.tar.bz2 |
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
Diffstat (limited to 'chrome/browser/ui/gtk/download/download_item_gtk.cc')
-rw-r--r-- | chrome/browser/ui/gtk/download/download_item_gtk.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/ui/gtk/download/download_item_gtk.cc b/chrome/browser/ui/gtk/download/download_item_gtk.cc index 1664516..bfe5768 100644 --- a/chrome/browser/ui/gtk/download/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download/download_item_gtk.cc @@ -562,7 +562,8 @@ void DownloadItemGtk::UpdateDangerWarning() { string16 dangerous_warning; // The dangerous download label text is different for different cases. - if (get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL) { + if (get_download()->GetDangerType() == + content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL) { // TODO(noelutz): handle malicious content warning. // Safebrowsing shows the download URL leads to malicious file. dangerous_warning = @@ -570,7 +571,7 @@ void DownloadItemGtk::UpdateDangerWarning() { } else { // It's a dangerous file type (e.g.: an executable). DCHECK(get_download()->GetDangerType() == - DownloadStateInfo::DANGEROUS_FILE); + content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE); if (ChromeDownloadManagerDelegate::IsExtensionDownload(get_download())) { dangerous_warning = l10n_util::GetStringUTF16(IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION); @@ -619,17 +620,17 @@ void DownloadItemGtk::UpdateDangerWarning() { void DownloadItemGtk::UpdateDangerIcon() { if (theme_service_->UsingNativeTheme()) { - const char* stock = - get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ? - GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING; + const char* stock = get_download()->GetDangerType() == + content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ? + GTK_STOCK_DIALOG_ERROR : GTK_STOCK_DIALOG_WARNING; gtk_image_set_from_stock( GTK_IMAGE(dangerous_image_), stock, GTK_ICON_SIZE_SMALL_TOOLBAR); } else { // Set the warning icon. ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - int pixbuf_id = - get_download()->GetDangerType() == DownloadStateInfo::DANGEROUS_URL ? - IDR_SAFEBROWSING_WARNING : IDR_WARNING; + int pixbuf_id = get_download()->GetDangerType() == + content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL ? + IDR_SAFEBROWSING_WARNING : IDR_WARNING; GdkPixbuf* download_pixbuf = rb.GetNativeImageNamed(pixbuf_id); gtk_image_set_from_pixbuf(GTK_IMAGE(dangerous_image_), download_pixbuf); } |