diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 16:52:04 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 16:52:04 +0000 |
| commit | 28d679296ec30b869f318d366f6b1f58d8afc63b (patch) | |
| tree | c42fb46ada1f514cd791816648e67df08c67763f /chrome | |
| parent | 207dace0b40c1b970be61a65fd0040beb06df7b2 (diff) | |
| download | chromium_src-28d679296ec30b869f318d366f6b1f58d8afc63b.zip chromium_src-28d679296ec30b869f318d366f6b1f58d8afc63b.tar.gz chromium_src-28d679296ec30b869f318d366f6b1f58d8afc63b.tar.bz2 | |
Fixes multiple definitions for DragDownload.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/115811
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/dom_ui/downloads_dom_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.cc | 2 | ||||
| -rw-r--r-- | chrome/common/temp_scaffolding_stubs.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc index a1de5a8..7f2f39c 100644 --- a/chrome/browser/dom_ui/downloads_dom_handler.cc +++ b/chrome/browser/dom_ui/downloads_dom_handler.cc @@ -21,7 +21,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" -#if defined(OS_WIN) +#if defined(TOOLKIT_VIEWS) // TODO(port): re-enable when download_util is ported #include "chrome/browser/download/download_util.h" #else diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc index cc75ea2..710b5fd 100644 --- a/chrome/common/temp_scaffolding_stubs.cc +++ b/chrome/common/temp_scaffolding_stubs.cc @@ -274,6 +274,7 @@ DownloadRequestDialogDelegate* DownloadRequestDialogDelegate::Create( return NULL; } +#if !defined(TOOLKIT_VIEWS) namespace download_util { void DragDownload(const DownloadItem* download, SkBitmap* icon) { @@ -281,6 +282,7 @@ void DragDownload(const DownloadItem* download, SkBitmap* icon) { } } // namespace download_util +#endif #if defined(OS_MACOSX) void HungRendererDialog::HideForTabContents(TabContents*) { diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h index 300c240..2b4ee63 100644 --- a/chrome/common/temp_scaffolding_stubs.h +++ b/chrome/common/temp_scaffolding_stubs.h @@ -321,9 +321,11 @@ class BookmarkEditorView { //--------------------------------------------------------------------------- // These stubs are for Browser +#if !defined(TOOLKIT_VIEWS) namespace download_util { void DragDownload(const DownloadItem* download, SkBitmap* icon); } // namespace download_util +#endif class DebuggerWindow : public base::RefCountedThreadSafe<DebuggerWindow> { public: |