Fix dangerous downloads. Ellipsis for long filenames.

chrome/browser/ui/webui/active_downloads_ui.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/ui/webui/active_downloads_ui.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 133 matching lines @@
 }
 
 void ActiveDownloadsUIHTMLSource::StartDataRequest(const std::string& path,
                                               bool is_incognito,
                                               int request_id) {
   DictionaryValue localized_strings;
   localized_strings.SetString("allowdownload",
       l10n_util::GetStringUTF16(IDS_FILEBROWSER_CONFIRM_DOWNLOAD));
   localized_strings.SetString("cancel",
       l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_CANCEL));
+  localized_strings.SetString("confirmcancel",
+      l10n_util::GetStringUTF16(IDS_FILEBROWSER_CONFIRM_CANCEL));
+  localized_strings.SetString("confirmyes",
+      l10n_util::GetStringUTF16(IDS_FILEBROWSER_CONFIRM_YES));
   localized_strings.SetString("open",
       l10n_util::GetStringUTF16(IDS_FILEBROWSER_OPEN));
   localized_strings.SetString("pause",
       l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_PAUSE));
   localized_strings.SetString("resume",
       l10n_util::GetStringUTF16(IDS_DOWNLOAD_LINK_RESUME));
   localized_strings.SetString("showalldownloads",
       l10n_util::GetStringUTF16(IDS_FILEBROWSER_SHOW_ALL_DOWNLOADS));
   FilePath default_download_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS,
@@ skipping 89 matching lines @@
 
 void ActiveDownloadsHandler::HandlePauseToggleDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
   if (item && item->IsPartialDownload())
     item->TogglePause();
 }
 
 void ActiveDownloadsHandler::HandleAllowDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
   if (item)
-    download_manager_->DangerousDownloadValidated(item);
+    item->DangerousDownloadValidated();
 }
 
 void ActiveDownloadsHandler::HandleCancelDownload(const ListValue* args) {
   DownloadItem* item = GetDownloadById(args);
-  if (item && item->IsPartialDownload()) {
-    item->Cancel(true);
+  if (item) {
+    if (item->IsPartialDownload())
+      item->Cancel(true);
     item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
   }
 }
 
 void ActiveDownloadsHandler::OpenNewFullWindow(const ListValue* args) {
   OpenNewWindow(args, false);
 }
 
 void ActiveDownloadsHandler::OpenNewPopupWindow(const ListValue* args) {
   OpenNewWindow(args, true);
@@ skipping 142 matching lines @@
       if (url.SchemeIs(chrome::kChromeUIScheme) &&
           url.host() == chrome::kChromeUIActiveDownloadsHost &&
           (*it)->profile() == profile) {
         return (*it);
       }
     }
   }
   return NULL;
 }