Remove even more cruft from temp_scaffolding_stubs.h. This change also enables modal_html_dialog_delegate.cc for Mac and Linux, since it's already ported. Porting defines in tab_contents.cc were removed to reflect the current state of the ports.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/174278

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

3 files changed, 1 insertions, 82 deletions

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index 3fdce1d..3eeacde 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -28,6 +28,7 @@
 #include "chrome/browser/jsmessage_box_handler.h"
 #include "chrome/browser/load_from_memory_cache_details.h"
 #include "chrome/browser/load_notification_details.h"
+#include "chrome/browser/modal_html_dialog_delegate.h"
 #include "chrome/browser/omnibox_search_hint.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/plugin_installer.h"
@@ -62,16 +63,6 @@
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/webpreferences.h"
 
-#if defined(OS_WIN)
-// For CRect
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
-// TODO(port): some of these headers should be ported.
-#include "chrome/browser/modal_html_dialog_delegate.h"
-#include "views/controls/scrollbar/native_scroll_bar.h"
-#endif
-
 #if defined(OS_CHROMEOS)
 // For GdkScreen
 #include <gdk/gdk.h>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 896d277..60864b6 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -2552,7 +2552,6 @@
             'browser/importer/ie_importer.cc',
             'browser/jumplist.cc',
             'browser/memory_details.cc',
-            'browser/modal_html_dialog_delegate.cc',
             'browser/sandbox_policy.cc',
             'browser/tab_contents/web_drag_source.cc',
             'browser/tab_contents/web_drop_target.cc',
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index f9af2e8..47e0e86 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -124,11 +124,6 @@ class PrintJobManager {
 
 }  // namespace printing
 
-struct ViewHostMsg_DidPrintPage_Params;
-
-class InputWindowDelegate {
-};
-
 //---------------------------------------------------------------------------
 // These stubs are for Browser
 
@@ -140,17 +135,6 @@ void DragDownload(const DownloadItem* download,
 }  // namespace download_util
 #endif
 
-class DebuggerWindow : public base::RefCountedThreadSafe<DebuggerWindow> {
- public:
-};
-
-class FaviconStatus {
- public:
-  const GURL& url() const { return url_; }
- private:
-  GURL url_;
-};
-
 #if defined(OS_MACOSX)
 class DockInfo {
  public:
@@ -162,69 +146,14 @@ class DockInfo {
 #endif
 
 //---------------------------------------------------------------------------
-// These stubs are for Profile
-
-class WebAppLauncher {
- public:
-  static void Launch(Profile* profile, const GURL& url) {
-    NOTIMPLEMENTED();
-  }
-};
-
-//---------------------------------------------------------------------------
 // These stubs are for TabContents
 
-class WebApp : public base::RefCountedThreadSafe<WebApp> {
- public:
-  class Observer {
-   public:
-  };
-  void AddObserver(Observer* obs) { NOTIMPLEMENTED(); }
-  void RemoveObserver(Observer* obs) { NOTIMPLEMENTED(); }
-  void SetTabContents(TabContents*) { NOTIMPLEMENTED(); }
-  SkBitmap GetFavIcon() {
-    NOTIMPLEMENTED();
-    return SkBitmap();
-  }
-};
-
-class ModalHtmlDialogDelegate : public HtmlDialogUIDelegate {
- public:
-  ModalHtmlDialogDelegate(const GURL&, int, int, const std::string&,
-                          IPC::Message*, TabContents*) { }
-
-   virtual bool IsDialogModal() const { return true; }
-   virtual std::wstring GetDialogTitle() const { return std::wstring(); }
-   virtual GURL GetDialogContentURL() const { return GURL(); }
-   virtual void GetDOMMessageHandlers(
-       std::vector<DOMMessageHandler*>* handlers) const {}
-   virtual void GetDialogSize(gfx::Size* size) const {}
-   virtual std::string GetDialogArgs() const { return std::string(); }
-   virtual void OnDialogClosed(const std::string& json_retval) {}
-};
-
-class HtmlDialogContents {
- public:
-  struct HtmlDialogParams {
-    GURL url;
-    int width;
-    int height;
-    std::string json_input;
-  };
-};
-
 class RepostFormWarningDialog {
  public:
   static void RunRepostFormWarningDialog(NavigationController*) { }
   virtual ~RepostFormWarningDialog() { }
 };
 
-class FontsLanguagesWindowView {
- public:
-  explicit FontsLanguagesWindowView(Profile* profile) { NOTIMPLEMENTED(); }
-  void SelectLanguagesTab() { NOTIMPLEMENTED(); }
-};
-
 class BaseDragSource {
 };