diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 23:31:41 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-06 23:31:41 +0000 |
| commit | 7ae7c2cbd38f886f4056fa7434a6c1189d98ffd2 (patch) | |
| tree | e606471e20eb79fea7a05c9005869065bf865ca1 /chrome/browser/download/download_util.cc | |
| parent | cab465ccf2a93d84e0f16987d8754ac2673eb118 (diff) | |
| download | chromium_src-7ae7c2cbd38f886f4056fa7434a6c1189d98ffd2.zip chromium_src-7ae7c2cbd38f886f4056fa7434a6c1189d98ffd2.tar.gz chromium_src-7ae7c2cbd38f886f4056fa7434a6c1189d98ffd2.tar.bz2 | |
Convert download manager to FilePath.
(Fixed up version of issue 17032. Now passes all unit tests.)
Review URL: http://codereview.chromium.org/16533
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7630 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download/download_util.cc')
| -rw-r--r-- | chrome/browser/download/download_util.cc | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 5af7c47..e264987 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -47,7 +47,7 @@ bool BaseContextMenu::IsItemChecked(int id) const { case OPEN_WHEN_COMPLETE: return download_->open_when_complete(); case ALWAYS_OPEN_TYPE: { - const std::wstring extension = + const FilePath::StringType extension = file_util::GetFileExtensionFromPath(download_->full_path()); return download_->manager()->ShouldOpenFileExtension(extension); } @@ -115,17 +115,17 @@ void BaseContextMenu::ExecuteCommand(int id) { scw.WriteText(download_->url()); break; case COPY_PATH: - scw.WriteText(download_->full_path()); + scw.WriteText(download_->full_path().ToWStringHack()); break; case COPY_FILE: // TODO(paulg): Move to OSExchangeData when implementing drag and drop? - scw.WriteFile(download_->full_path()); + scw.WriteFile(download_->full_path().ToWStringHack()); break; case OPEN_WHEN_COMPLETE: OpenDownload(download_); break; case ALWAYS_OPEN_TYPE: { - const std::wstring extension = + const FilePath::StringType extension = file_util::GetFileExtensionFromPath(download_->full_path()); download_->manager()->OpenFilesOfExtension( extension, !IsItemChecked(ALWAYS_OPEN_TYPE)); @@ -221,11 +221,11 @@ DownloadDestinationContextMenu::~DownloadDestinationContextMenu() { // Download opening ------------------------------------------------------------ bool CanOpenDownload(DownloadItem* download) { - std::wstring file_to_use = download->full_path(); - if (!download->original_name().empty()) + FilePath file_to_use = download->full_path(); + if (!download->original_name().value().empty()) file_to_use = download->original_name(); - const std::wstring extension = + const FilePath::StringType extension = file_util::GetFileExtensionFromPath(file_to_use); return !download->manager()->IsExecutable(extension); } @@ -416,8 +416,9 @@ void DragDownload(const DownloadItem* download, SkBitmap* icon) { // Set up our OLE machinery scoped_refptr<OSExchangeData> data(new OSExchangeData); if (icon) - drag_utils::CreateDragImageForFile(download->file_name(), icon, data); - data->SetFilename(download->full_path()); + drag_utils::CreateDragImageForFile(download->file_name().ToWStringHack(), + icon, data); + data->SetFilename(download->full_path().ToWStringHack()); scoped_refptr<BaseDragSource> drag_source(new BaseDragSource); // Run the drag and drop loop @@ -426,6 +427,4 @@ void DragDownload(const DownloadItem* download, SkBitmap* icon) { &effects); } - } // namespace download_util - |