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

7 files changed, 5 insertions, 133 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.
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 12eb600..8642353 100755
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -753,12 +753,12 @@
         }, { # else: OS != "win"
           'sources!': [
             'common/classfactory.cc',
+            'common/temp_scaffolding_stubs.h',
           ],
         }],
-        ['OS=="win" or (OS=="linux" and toolkit_views==0)', {
+        ['OS=="win" or OS=="linux"', {
           'sources!': [
             'common/temp_scaffolding_stubs.cc',
-            'common/temp_scaffolding_stubs.h',
           ],
         }],
       ],
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index c7d665a..a1dc297 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -8,31 +8,13 @@
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/browser/first_run.h"
-#include "chrome/browser/rlz/rlz.h"
-
-#if defined(OS_LINUX)
-#include "chrome/browser/dock_info.h"
-#include "chrome/common/render_messages.h"
-#endif
-
-#if defined(OS_MACOSX)
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/fonts_languages_window.h"
 #include "chrome/browser/memory_details.h"
-#endif
-
-#if defined(TOOLKIT_VIEWS)
-#include "chrome/browser/download/download_request_manager.h"
-#include "chrome/browser/tab_contents/constrained_window.h"
-#endif
-
-class TabContents;
 
 //--------------------------------------------------------------------------
 
-#if defined(OS_MACOSX)
 void AutomationProvider::GetAutocompleteEditForBrowser(
     int browser_handle,
     bool* success,
@@ -77,35 +59,6 @@ void AutomationProvider::OnMessageFromExternalHost(
   NOTIMPLEMENTED();
 }
 
-#endif  // defined(OS_MACOSX)
-
-//--------------------------------------------------------------------------
-// static
-bool Upgrade::IsBrowserAlreadyRunning() {
-  // http://code.google.com/p/chromium/issues/detail?id=9295
-  return false;
-}
-
-// static
-bool Upgrade::RelaunchChromeBrowser(const CommandLine& command_line) {
-  // http://code.google.com/p/chromium/issues/detail?id=9295
-  return true;
-}
-
-// static
-bool Upgrade::SwapNewChromeExeIfPresent() {
-  // http://code.google.com/p/chromium/issues/detail?id=9295
-  return true;
-}
-
-// static
-Upgrade::TryResult ShowTryChromeDialog(size_t version) {
-  return Upgrade::TD_NOT_NOW;
-}
-
-//--------------------------------------------------------------------------
-
-#if defined(OS_MACOSX)
 void InstallJankometer(const CommandLine&) {
   // http://code.google.com/p/chromium/issues/detail?id=8077
 }
@@ -113,29 +66,8 @@ void InstallJankometer(const CommandLine&) {
 void UninstallJankometer() {
   // http://code.google.com/p/chromium/issues/detail?id=8077
 }
-#endif
-
-//--------------------------------------------------------------------------
-
-void RLZTracker::CleanupRlz() {
-  // http://code.google.com/p/chromium/issues/detail?id=8152
-}
-
-bool RLZTracker::GetAccessPointRlz(AccessPoint point, std::wstring* rlz) {
-  // http://code.google.com/p/chromium/issues/detail?id=8152
-  return false;
-}
-
-bool RLZTracker::RecordProductEvent(Product product, AccessPoint point,
-                                    Event event) {
-  // http://code.google.com/p/chromium/issues/detail?id=8152
-  return false;
-}
-
-//--------------------------------------------------------------------------
-
-#if defined(OS_MACOSX)
 MemoryDetails::MemoryDetails() {
+
   NOTIMPLEMENTED();
   process_data_.push_back(ProcessData());
 }
@@ -149,21 +81,7 @@ void MemoryDetails::StartFetch() {
   MessageLoop::current()->PostTask(
       FROM_HERE, NewRunnableMethod(this, &MemoryDetails::OnDetailsAvailable));
 }
-#endif
 
-#if !defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-namespace download_util {
-
-void DragDownload(const DownloadItem* download,
-                  SkBitmap* icon,
-                  gfx::NativeView view) {
-  NOTIMPLEMENTED();
-}
-
-}  // namespace download_util
-#endif
-
-#if defined(OS_MACOSX)
 void BrowserList::AllBrowsersClosed() {
   // TODO(port): Close any dependent windows if necessary when the last browser
   //             window is closed.
@@ -182,15 +100,11 @@ void DockInfo::AdjustOtherWindowBounds() const {
   // TODO(pinkerton): Implement on Mac.
   // http://crbug.com/9274
 }
-#endif
 
 //------------------------------------------------------------------------------
 
-#if defined(OS_MACOSX)
 void ShowFontsLanguagesWindow(gfx::NativeWindow window,
                               FontsLanguagesPage page,
                               Profile* profile) {
   NOTIMPLEMENTED();
 }
-#endif
-
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index a310508..50d5c57 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -17,15 +17,8 @@
 #include "build/build_config.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 
-#if !defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-// For download_util::DragDownload
-#include "app/gfx/native_widget_types.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#endif
-
 class CancelableTask;
 class CommandLine;
-class DownloadItem;
 class TabContents;
 struct ViewHostMsg_DidPrintPage_Params;
 
@@ -122,28 +115,12 @@ class PrintJobManager {
 //---------------------------------------------------------------------------
 // These stubs are for Browser
 
-#if !defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
-namespace download_util {
-void DragDownload(const DownloadItem* download,
-                  SkBitmap* icon,
-                  gfx::NativeView view);
-}  // namespace download_util
-#endif
-
 #if defined(OS_MACOSX)
 class DockInfo {
  public:
   bool GetNewWindowBounds(gfx::Rect*, bool*) const;
   void AdjustOtherWindowBounds() const;
 };
-#else
-
 #endif
 
-//---------------------------------------------------------------------------
-// These stubs are for TabContents
-
-class BaseDragSource {
-};
-
 #endif  // CHROME_COMMON_TEMP_SCAFFOLDING_STUBS_H_