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

Side by Side Diff: chrome/browser/download/download_util.cc

Issue 8585040: Fix DownloadTests and change cros/aura to use shelf (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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(beng): 522 // TODO(davemoore) Implement once UX for download is decided <104742>
523 NOTIMPLEMENTED();
524 #elif defined(OS_WIN) 523 #elif defined(OS_WIN)
525 // Taskbar progress bar is only supported on Win7. 524 // Taskbar progress bar is only supported on Win7.
526 if (base::win::GetVersion() < base::win::VERSION_WIN7) 525 if (base::win::GetVersion() < base::win::VERSION_WIN7)
527 return; 526 return;
528 527
529 base::win::ScopedComPtr<ITaskbarList3> taskbar; 528 base::win::ScopedComPtr<ITaskbarList3> taskbar;
530 HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL, 529 HRESULT result = taskbar.CreateInstance(CLSID_TaskbarList, NULL,
531 CLSCTX_INPROC_SERVER); 530 CLSCTX_INPROC_SERVER);
532 if (FAILED(result)) { 531 if (FAILED(result)) {
533 VLOG(1) << "Failed creating a TaskbarList object: " << result; 532 VLOG(1) << "Failed creating a TaskbarList object: " << result;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 return DownloadFile::GetUniquePathNumberWithSuffix( 565 return DownloadFile::GetUniquePathNumberWithSuffix(
567 path, FILE_PATH_LITERAL(".crdownload")); 566 path, FILE_PATH_LITERAL(".crdownload"));
568 } 567 }
569 568
570 FilePath GetCrDownloadPath(const FilePath& suggested_path) { 569 FilePath GetCrDownloadPath(const FilePath& suggested_path) {
571 return DownloadFile::AppendSuffixToPath( 570 return DownloadFile::AppendSuffixToPath(
572 suggested_path, FILE_PATH_LITERAL(".crdownload")); 571 suggested_path, FILE_PATH_LITERAL(".crdownload"));
573 } 572 }
574 573
575 } // namespace download_util 574 } // namespace download_util
OLDNEW
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698