diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 00:24:39 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-20 00:24:39 +0000 |
| commit | dcefa305312e7045cce1ec6bc746a4ba26dec871 (patch) | |
| tree | 7fbea6592ac6d4c59cc456227a3d5195818a7679 /chrome/browser/dom_ui | |
| parent | cf2a4e4fe2c337c2c4bf4f14443fc2cbb3f6e2d9 (diff) | |
| download | chromium_src-dcefa305312e7045cce1ec6bc746a4ba26dec871.zip chromium_src-dcefa305312e7045cce1ec6bc746a4ba26dec871.tar.gz chromium_src-dcefa305312e7045cce1ec6bc746a4ba26dec871.tar.bz2 | |
Linux download shelf icons first cut.
Nor do we have support for alternate file formats; nor do we have a default icon.
BUG=http://crbug.com/8631
Review URL: http://codereview.chromium.org/113571
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16444 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/downloads_dom_handler.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/downloads_ui.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/fileicon_source.h | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc index ea56c07..f38a664 100644 --- a/chrome/browser/dom_ui/downloads_dom_handler.cc +++ b/chrome/browser/dom_ui/downloads_dom_handler.cc @@ -5,6 +5,7 @@ #include "chrome/browser/dom_ui/downloads_dom_handler.h" #include "app/l10n_util.h" +#include "base/basictypes.h" #include "base/gfx/png_encoder.h" #include "base/string_piece.h" #include "base/thread.h" @@ -12,10 +13,6 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" #include "chrome/browser/dom_ui/fileicon_source.h" -#if defined(OS_WIN) -// TODO(port): re-enable when download_util is ported -#include "chrome/browser/download/download_util.h" -#endif #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/common/jstemplate_builder.h" @@ -24,6 +21,13 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#if defined(OS_WIN) +// TODO(port): re-enable when download_util is ported +#include "chrome/browser/download/download_util.h" +#else +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + namespace { // Maximum number of downloads to show. TODO(glen): Remove this and instead diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 76eb9074..9039200 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -19,6 +19,14 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#if defined(OS_WIN) +// TODO(port): re-enable when download_util is ported +#include "chrome/browser/download/download_util.h" +#else +#include "chrome/common/temp_scaffolding_stubs.h" +#endif + + namespace { /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h index 423efcb..0f2924d 100644 --- a/chrome/browser/dom_ui/fileicon_source.h +++ b/chrome/browser/dom_ui/fileicon_source.h @@ -7,13 +7,7 @@ #include "app/resource_bundle.h" #include "chrome/browser/dom_ui/chrome_url_data_manager.h" - -#if defined(OS_WIN) #include "chrome/browser/icon_manager.h" -#else -// TODO(port): Remove when IconManager has been ported. -#include "chrome/common/temp_scaffolding_stubs.h" -#endif class GURL; |