Clean up temp scaffolding stubs some. It can be mac only now.

BUG=9295,8077
TEST=trybots
Review URL: http://codereview.chromium.org/340052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30714 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 21 deletions

diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc
index 6799475..d11719f 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.cc
+++ b/chrome/browser/dom_ui/downloads_dom_handler.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/fileicon_source.h"
+#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
@@ -24,13 +25,6 @@
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
-// 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 5df2ac6..d01120d 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -21,14 +21,6 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_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/download/download_util.h b/chrome/browser/download/download_util.h
index ba0e368..5238a97 100644
--- a/chrome/browser/download/download_util.h
+++ b/chrome/browser/download/download_util.h
@@ -125,11 +125,9 @@ void PaintDownloadComplete(gfx::Canvas* canvas,
 // Helper function for download views to use when acting as a drag source for a
 // DownloadItem. If |icon| is NULL, no image will be accompany the drag. |view|
 // is only required for Mac OS X, elsewhere it can be NULL.
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
 void DragDownload(const DownloadItem* download,
                   SkBitmap* icon,
                   gfx::NativeView view);
-#endif
 
 // Executable file support -----------------------------------------------------
 
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h
index 2f4ca92..b179ce4 100644
--- a/chrome/browser/first_run.h
+++ b/chrome/browser/first_run.h
@@ -97,10 +97,7 @@ class FirstRun {
   DISALLOW_IMPLICIT_CONSTRUCTORS(FirstRun);
 };
 
-#if !defined(OS_LINUX) || defined(TOOLKIT_VIEWS)
-// TODO(port): remove on Mac and Linux+views as well.
-// http://code.google.com/p/chromium/issues/detail?id=9295
-
+#if defined(OS_WIN)
 // This class contains the actions that need to be performed when an upgrade
 // is required. This involves mainly swapping the chrome exe and relaunching
 // the new browser.