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

Side by Side Diff: chrome/browser/dom_ui/downloads_dom_handler.cc

Issue 115811: Fixes multiple definitions for DragDownload. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 7 months 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 | « no previous file | chrome/common/temp_scaffolding_stubs.h » ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 #include "chrome/browser/dom_ui/downloads_dom_handler.h" 5 #include "chrome/browser/dom_ui/downloads_dom_handler.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/gfx/png_encoder.h" 9 #include "base/gfx/png_encoder.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
11 #include "base/thread.h" 11 #include "base/thread.h"
12 #include "base/time_format.h" 12 #include "base/time_format.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h" 14 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
15 #include "chrome/browser/dom_ui/fileicon_source.h" 15 #include "chrome/browser/dom_ui/fileicon_source.h"
16 #include "chrome/browser/metrics/user_metrics.h" 16 #include "chrome/browser/metrics/user_metrics.h"
17 #include "chrome/browser/profile.h" 17 #include "chrome/browser/profile.h"
18 #include "chrome/common/jstemplate_builder.h" 18 #include "chrome/common/jstemplate_builder.h"
19 #include "chrome/common/time_format.h" 19 #include "chrome/common/time_format.h"
20 #include "chrome/common/url_constants.h" 20 #include "chrome/common/url_constants.h"
21 #include "grit/browser_resources.h" 21 #include "grit/browser_resources.h"
22 #include "grit/generated_resources.h" 22 #include "grit/generated_resources.h"
23 23
24 #if defined(OS_WIN) 24 #if defined(TOOLKIT_VIEWS)
25 // TODO(port): re-enable when download_util is ported 25 // TODO(port): re-enable when download_util is ported
26 #include "chrome/browser/download/download_util.h" 26 #include "chrome/browser/download/download_util.h"
27 #else 27 #else
28 #include "chrome/common/temp_scaffolding_stubs.h" 28 #include "chrome/common/temp_scaffolding_stubs.h"
29 #endif 29 #endif
30 30
31 namespace { 31 namespace {
32 32
33 // Maximum number of downloads to show. TODO(glen): Remove this and instead 33 // Maximum number of downloads to show. TODO(glen): Remove this and instead
34 // stuff the downloads down the pipe slowly. 34 // stuff the downloads down the pipe slowly.
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 else if (download->TimeRemaining(&remaining)) 339 else if (download->TimeRemaining(&remaining))
340 time_remaining = TimeFormat::TimeRemaining(remaining); 340 time_remaining = TimeFormat::TimeRemaining(remaining);
341 341
342 if (time_remaining.empty()) { 342 if (time_remaining.empty()) {
343 return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS_TIME_UNKNOWN, 343 return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS_TIME_UNKNOWN,
344 speed_text, amount); 344 speed_text, amount);
345 } 345 }
346 return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, amount, 346 return l10n_util::GetStringF(IDS_DOWNLOAD_TAB_PROGRESS_STATUS, amount,
347 time_remaining); 347 time_remaining);
348 } 348 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/temp_scaffolding_stubs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698