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

Unified Diff: chrome/browser/ui/webui/active_downloads_ui.cc

Issue 8528046: Change "Show All Downloads" link to "Show all files" (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/active_downloads.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/active_downloads_ui.cc
===================================================================
--- chrome/browser/ui/webui/active_downloads_ui.cc (revision 110202)
+++ chrome/browser/ui/webui/active_downloads_ui.cc (working copy)
@@ -24,9 +24,11 @@
#include "base/values.h"
#include "chrome/browser/chromeos/cros/cros_library.h"
#include "chrome/browser/chromeos/media/media_player.h"
+#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/download/download_service.h"
#include "chrome/browser/download/download_service_factory.h"
#include "chrome/browser/download/download_util.h"
+#include "chrome/browser/extensions/file_manager_util.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser.h"
@@ -55,7 +57,7 @@
static const int kPopupTop = 0;
static const int kPopupWidth = 250;
// Minimum height of window must be 100, so kPopupHeight has space for
-// 2 download rows of 36 px and 'Show All Downloads' which is 29px.
+// 2 download rows of 36 px and 'Show all files' link which is 29px.
static const int kPopupHeight = 36 * 2 + 29;
static const char kPropertyPath[] = "path";
@@ -76,8 +78,8 @@
source->AddLocalizedString("continue", IDS_CONTINUE_EXTENSION_DOWNLOAD);
source->AddLocalizedString("pause", IDS_DOWNLOAD_LINK_PAUSE);
source->AddLocalizedString("resume", IDS_DOWNLOAD_LINK_RESUME);
- source->AddLocalizedString("showalldownloads",
- IDS_FILEBROWSER_SHOW_ALL_DOWNLOADS);
+ source->AddLocalizedString("showallfiles",
+ IDS_FILE_BROWSER_MORE_FILES);
source->AddLocalizedString("error_unknown_file_type",
IDS_FILEBROWSER_ERROR_UNKNOWN_FILE_TYPE);
@@ -129,8 +131,9 @@
// WebUI Callbacks.
void HandleGetDownloads(const ListValue* args);
void HandlePauseToggleDownload(const ListValue* args);
+ void HandleAllowDownload(const ListValue* args);
void HandleCancelDownload(const ListValue* args);
- void HandleAllowDownload(const ListValue* args);
+ void HandleShowAllFiles(const ListValue* args);
void OpenNewFullWindow(const ListValue* args);
void PlayMediaFile(const ListValue* args);
@@ -189,11 +192,14 @@
web_ui_->RegisterMessageCallback("pauseToggleDownload",
base::Bind(&ActiveDownloadsHandler::HandlePauseToggleDownload,
base::Unretained(this)));
+ web_ui_->RegisterMessageCallback("allowDownload",
+ base::Bind(&ActiveDownloadsHandler::HandleAllowDownload,
+ base::Unretained(this)));
web_ui_->RegisterMessageCallback("cancelDownload",
base::Bind(&ActiveDownloadsHandler::HandleCancelDownload,
base::Unretained(this)));
- web_ui_->RegisterMessageCallback("allowDownload",
- base::Bind(&ActiveDownloadsHandler::HandleAllowDownload,
+ web_ui_->RegisterMessageCallback("showAllFiles",
+ base::Bind(&ActiveDownloadsHandler::HandleShowAllFiles,
base::Unretained(this)));
web_ui_->RegisterMessageCallback("openNewFullWindow",
base::Bind(&ActiveDownloadsHandler::OpenNewFullWindow,
@@ -243,6 +249,11 @@
}
}
+void ActiveDownloadsHandler::HandleShowAllFiles(const ListValue* args) {
+ FileManagerUtil::ViewFolder(
+ DownloadPrefs::FromDownloadManager(download_manager_)->download_path());
+}
+
bool ActiveDownloadsHandler::SelectTab(const GURL& url) {
for (TabContentsIterator it; !it.done(); ++it) {
TabContents* tab_contents = it->tab_contents();
« no previous file with comments | « chrome/browser/resources/active_downloads.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698