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

2 files changed, 1 insertions, 110 deletions

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_