diff options
| author | ljagielski@opera.com <ljagielski@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 20:35:33 +0000 |
|---|---|---|
| committer | ljagielski@opera.com <ljagielski@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 20:35:33 +0000 |
| commit | f35c32b023487569ba0d9779906b331dd795c829 (patch) | |
| tree | ab99dd6151b991862dc9e0c9ca2dab4be50b0079 /chrome/browser/download | |
| parent | 35a9933440603ee0f7c62534a92ed0ab25f9eb4b (diff) | |
| download | chromium_src-f35c32b023487569ba0d9779906b331dd795c829.zip chromium_src-f35c32b023487569ba0d9779906b331dd795c829.tar.gz chromium_src-f35c32b023487569ba0d9779906b331dd795c829.tar.bz2 | |
Added SERVER_UNAUTHORIZED download interrupt reason.
chrome/app/generated_resources.grd: added messages for
DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED
content/browser/download: handling of
DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED
BUG=386146
Review URL: https://codereview.chromium.org/351863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
| -rw-r--r-- | chrome/browser/download/download_item_model.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/download/download_item_model_unittest.cc | 8 |
2 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index aa1aefd..7536a2a 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -169,6 +169,12 @@ base::string16 InterruptReasonStatusMessage(int reason) { case content::DOWNLOAD_INTERRUPT_REASON_CRASH: string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_CRASH; break; + case content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED: + string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_UNAUTHORIZED; + break; + case content::DOWNLOAD_INTERRUPT_REASON_SERVER_CERT_PROBLEM: + string_id = IDS_DOWNLOAD_INTERRUPTED_STATUS_SERVER_CERT_PROBLEM; + break; case content::DOWNLOAD_INTERRUPT_REASON_NONE: NOTREACHED(); // fallthrough @@ -241,6 +247,12 @@ base::string16 InterruptReasonMessage(int reason) { case content::DOWNLOAD_INTERRUPT_REASON_CRASH: string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_CRASH; break; + case content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED: + string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_UNAUTHORIZED; + break; + case content::DOWNLOAD_INTERRUPT_REASON_SERVER_CERT_PROBLEM: + string_id = IDS_DOWNLOAD_INTERRUPTED_DESCRIPTION_SERVER_CERT_PROBLEM; + break; case content::DOWNLOAD_INTERRUPT_REASON_NONE: NOTREACHED(); // fallthrough diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index aa60862..4917747 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -162,6 +162,10 @@ TEST_F(DownloadItemModelTest, InterruptedStatus) { "Failed - Download error" }, { content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT, "Failed - No file" }, + { content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED, + "Failed - Needs authorization" }, + { content::DOWNLOAD_INTERRUPT_REASON_SERVER_CERT_PROBLEM, + "Failed - Bad certificate" }, { content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED, "Cancelled" }, { content::DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN, @@ -234,6 +238,10 @@ TEST_F(DownloadItemModelTest, InterruptTooltip) { "foo.bar\nDownload error" }, { content::DOWNLOAD_INTERRUPT_REASON_SERVER_BAD_CONTENT, "foo.bar\nNo file" }, + { content::DOWNLOAD_INTERRUPT_REASON_SERVER_UNAUTHORIZED, + "foo.bar\nNeeds authorization" }, + { content::DOWNLOAD_INTERRUPT_REASON_SERVER_CERT_PROBLEM, + "foo.bar\nBad certificate" }, { content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED, "foo.bar" }, { content::DOWNLOAD_INTERRUPT_REASON_USER_SHUTDOWN, |