Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Side by Side Diff: chrome/browser/ui/webui/active_downloads_ui.cc

Issue 8624008: Make malicious content download warning include the download filename (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/active_downloads_ui.h" 5 #include "chrome/browser/ui/webui/active_downloads_ui.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 static const char kPropertyDirectory[] = "isDirectory"; 65 static const char kPropertyDirectory[] = "isDirectory";
66 static const char kActiveDownloadAppName[] = "active-downloads"; 66 static const char kActiveDownloadAppName[] = "active-downloads";
67 67
68 ChromeWebUIDataSource* CreateActiveDownloadsUIHTMLSource() { 68 ChromeWebUIDataSource* CreateActiveDownloadsUIHTMLSource() {
69 ChromeWebUIDataSource* source = 69 ChromeWebUIDataSource* source =
70 new ChromeWebUIDataSource(chrome::kChromeUIActiveDownloadsHost); 70 new ChromeWebUIDataSource(chrome::kChromeUIActiveDownloadsHost);
71 71
72 source->AddLocalizedString("dangerousfile", IDS_PROMPT_DANGEROUS_DOWNLOAD); 72 source->AddLocalizedString("dangerousfile", IDS_PROMPT_DANGEROUS_DOWNLOAD);
73 source->AddLocalizedString("dangerousextension", 73 source->AddLocalizedString("dangerousextension",
74 IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION); 74 IDS_PROMPT_DANGEROUS_DOWNLOAD_EXTENSION);
75 source->AddLocalizedString("dangerousurl", IDS_PROMPT_UNSAFE_DOWNLOAD_URL); 75 source->AddLocalizedString("dangerousurl", IDS_PROMPT_MALICIOUS_DOWNLOAD_URL);
76 source->AddLocalizedString("dangerouscontent",
77 IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT);
76 source->AddLocalizedString("cancel", IDS_DOWNLOAD_LINK_CANCEL); 78 source->AddLocalizedString("cancel", IDS_DOWNLOAD_LINK_CANCEL);
77 source->AddLocalizedString("discard", IDS_DISCARD_DOWNLOAD); 79 source->AddLocalizedString("discard", IDS_DISCARD_DOWNLOAD);
78 source->AddLocalizedString("continue", IDS_CONTINUE_EXTENSION_DOWNLOAD); 80 source->AddLocalizedString("continue", IDS_CONTINUE_EXTENSION_DOWNLOAD);
79 source->AddLocalizedString("pause", IDS_DOWNLOAD_LINK_PAUSE); 81 source->AddLocalizedString("pause", IDS_DOWNLOAD_LINK_PAUSE);
80 source->AddLocalizedString("resume", IDS_DOWNLOAD_LINK_RESUME); 82 source->AddLocalizedString("resume", IDS_DOWNLOAD_LINK_RESUME);
81 source->AddLocalizedString("showallfiles", 83 source->AddLocalizedString("showallfiles",
82 IDS_FILE_BROWSER_MORE_FILES); 84 IDS_FILE_BROWSER_MORE_FILES);
83 source->AddLocalizedString("error_unknown_file_type", 85 source->AddLocalizedString("error_unknown_file_type",
84 IDS_FILEBROWSER_ERROR_UNKNOWN_FILE_TYPE); 86 IDS_FILEBROWSER_ERROR_UNKNOWN_FILE_TYPE);
85 87
(...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 } 441 }
440 } 442 }
441 } 443 }
442 return NULL; 444 return NULL;
443 } 445 }
444 #endif // defined(TOUCH_UI) 446 #endif // defined(TOUCH_UI)
445 447
446 const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const { 448 const ActiveDownloadsUI::DownloadList& ActiveDownloadsUI::GetDownloads() const {
447 return handler_->downloads(); 449 return handler_->downloads();
448 } 450 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698