diff options
| author | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 03:08:39 +0000 |
|---|---|---|
| committer | achuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-03 03:08:39 +0000 |
| commit | 89045daad76769827d3a51f24f3f5e9942955655 (patch) | |
| tree | 7aedaa7935a66b43aef297210b6d2f7d191fabb8 | |
| parent | cd21f204be6010ccaa04f35375d6342753b2e30c (diff) | |
| download | chromium_src-89045daad76769827d3a51f24f3f5e9942955655.zip chromium_src-89045daad76769827d3a51f24f3f5e9942955655.tar.gz chromium_src-89045daad76769827d3a51f24f3f5e9942955655.tar.bz2 | |
Merge 108374 - Open cros filemanager when "Open Downloads Folder" is clicked.
BUG=chromium-os:21585
TEST=On ChromeOS, ctrl-j for the downloads page, click on Open Downloads Folder to have a new tab open with the filemanager extension positioned in the Downloads folder.
Review URL: http://codereview.chromium.org/8439018
TBR=achuith@chromium.org
Review URL: http://codereview.chromium.org/8372091
git-svn-id: svn://svn.chromium.org/chrome/branches/912/src@108408 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/ui/webui/downloads_dom_handler.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index 5cc861b..ba9d0fd 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -39,6 +39,10 @@ #include "content/browser/browser_thread.h" #endif +#if defined(OS_CHROMEOS) +#include "chrome/browser/extensions/file_manager_util.h" +#endif + namespace { // Maximum number of downloads to show. TODO(glen): Remove this and instead @@ -357,6 +361,10 @@ void DownloadsDOMHandler::HandleOpenDownloadsFolder(const ListValue* args) { #if defined(OS_MACOSX) // Must be called from the UI thread on Mac. platform_util::OpenItem(path); +#elif defined(OS_CHROMEOS) + FileManagerUtil::ShowFullTabUrl( + Profile::FromBrowserContext(download_manager_->browser_context()), + path); #else BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, |