| OLD | NEW |
| 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 // Download utility implementation | 5 // Download utility implementation |
| 6 | 6 |
| 7 #include "chrome/browser/download/download_util.h" | 7 #include "chrome/browser/download/download_util.h" |
| 8 | 8 |
| 9 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
| 10 #include <shobjidl.h> | 10 #include <shobjidl.h> |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 512 } | 512 } |
| 513 return l10n_util::GetStringFUTF16(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, | 513 return l10n_util::GetStringFUTF16(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, |
| 514 speed_text, amount, time_remaining); | 514 speed_text, amount, time_remaining); |
| 515 } | 515 } |
| 516 | 516 |
| 517 #if !defined(OS_MACOSX) | 517 #if !defined(OS_MACOSX) |
| 518 void UpdateAppIconDownloadProgress(int download_count, | 518 void UpdateAppIconDownloadProgress(int download_count, |
| 519 bool progress_known, | 519 bool progress_known, |
| 520 float progress) { | 520 float progress) { |
| 521 #if defined(USE_AURA) | 521 #if defined(USE_AURA) |
| 522 // TODO(davemoore) Implement once UX for download is decided <104742> | 522 // TODO(beng): |
| 523 NOTIMPLEMENTED(); |
| 523 #elif defined(OS_WIN) | 524 #elif defined(OS_WIN) |
| 524 // Taskbar progress bar is only supported on Win7. | 525 // Taskbar progress bar is only supported on Win7. |
| 525 if (base::win::GetVersion() < base::win::VERSION_WIN7) | 526 if (base::win::GetVersion() < base::win::VERSION_WIN7) |
| 526 return; | 527 return; |
| 527 | 528 |
| 528 base::win::ScopedComPtr<ITaskbarList3> taskbar; | 529 base::win::ScopedComPtr<ITaskbarList3> taskbar; |
| 529 HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL, | 530 HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL, |
| 530 CLSCTX_INPROC_SERVER); | 531 CLSCTX_INPROC_SERVER); |
| 531 if (FAILED(result)) { | 532 if (FAILED(result)) { |
| 532 VLOG(1) << "Failed creating a TaskbarList object: " << result; | 533 VLOG(1) << "Failed creating a TaskbarList object: " << result; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 565 return DownloadFile::GetUniquePathNumberWithSuffix( | 566 return DownloadFile::GetUniquePathNumberWithSuffix( |
| 566 path, FILE_PATH_LITERAL(".crdownload")); | 567 path, FILE_PATH_LITERAL(".crdownload")); |
| 567 } | 568 } |
| 568 | 569 |
| 569 FilePath GetCrDownloadPath(const FilePath& suggested_path) { | 570 FilePath GetCrDownloadPath(const FilePath& suggested_path) { |
| 570 return DownloadFile::AppendSuffixToPath( | 571 return DownloadFile::AppendSuffixToPath( |
| 571 suggested_path, FILE_PATH_LITERAL(".crdownload")); | 572 suggested_path, FILE_PATH_LITERAL(".crdownload")); |
| 572 } | 573 } |
| 573 | 574 |
| 574 } // namespace download_util | 575 } // namespace download_util |
| OLD | NEW |