Temporary scaffolding cleanup.

Review URL: http://codereview.chromium.org/182048

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

2 files changed, 18 insertions, 30 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 4d8f364..f2d8afb 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -10,29 +10,27 @@
 
 #include "base/gfx/rect.h"
 #include "base/logging.h"
-#include "chrome/browser/automation/automation_provider.h"
-#include "chrome/browser/download/download_request_dialog_delegate.h"
-#include "chrome/browser/download/download_request_manager.h"
+#include "chrome/browser/browser_list.h"
 #include "chrome/browser/first_run.h"
-#include "chrome/browser/fonts_languages_window.h"
-#include "chrome/browser/hung_renderer_dialog.h"
-#include "chrome/browser/memory_details.h"
-#include "chrome/browser/options_window.h"
 #include "chrome/browser/rlz/rlz.h"
-#include "chrome/browser/shell_integration.h"
-#include "chrome/browser/tab_contents/infobar_delegate.h"
-#include "chrome/common/process_watcher.h"
 
 #if defined(OS_LINUX)
 #include "chrome/browser/dock_info.h"
 #endif
 
+#if defined(OS_MACOSX)
+#include "chrome/browser/automation/automation_provider.h"
+#include "chrome/browser/fonts_languages_window.h"
+#include "chrome/browser/memory_details.h"
+#include "chrome/browser/options_window.h"
+#endif
+
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_manager.h"
+#include "chrome/browser/download/download_request_dialog_delegate.h"
+#include "chrome/browser/download/download_request_manager.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
-#include "views/controls/menu/menu_item_view.h"
-#include "views/controls/single_split_view.h"
 #endif
 
 class TabContents;
@@ -226,7 +224,7 @@ void MemoryDetails::StartFetch() {
 }
 #endif
 
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
 // This should prompt the user if she wants to allow more than one concurrent
 // download per tab. Until this is in place, always allow multiple downloads.
 class DownloadRequestDialogDelegateStub
@@ -300,7 +298,7 @@ void ShowFontsLanguagesWindow(gfx::NativeWindow window,
 
 //------------------------------------------------------------------------------
 
-#if defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
+#if defined(TOOLKIT_VIEWS)
 
 ConstrainedWindow* ConstrainedWindow::CreateConstrainedDialog(
     TabContents* owner,
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 0ccab4e..2ed3181 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -12,30 +12,20 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/gfx/native_widget_types.h"
-#include "base/gfx/size.h"
 #include "base/logging.h"
 #include "base/ref_counted.h"
-#include "base/string16.h"
 #include "build/build_config.h"
-#include "chrome/browser/dom_ui/html_dialog_ui.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "googleurl/src/gurl.h"
+
+#if !defined(TOOLKIT_VIEWS) && !defined(OS_MACOSX)
+// For download_util::DragDownload
+#include "base/gfx/native_widget_types.h"
 #include "third_party/skia/include/core/SkBitmap.h"
+#endif
 
-class BookmarkContextMenu;
-class BookmarkNode;
-class Browser;
+class CancelableTask;
 class CommandLine;
 class DownloadItem;
-class MessageLoop;
-class NavigationController;
-class ProcessSingleton;
-class Profile;
-class RenderViewHostDelegate;
-class SiteInstance;
-class URLRequest;
 class TabContents;
 struct ViewHostMsg_DidPrintPage_Params;