Remove TabContentsDelegate from scaffolding. Remove a large chunk of ifdef'd code from browser.cc to go along with it as well as enabling more functionality.

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

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

2 files changed, 10 insertions, 75 deletions

diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 1219c88..9ba6d3e 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -138,7 +138,9 @@ void OpenFirstRunDialog(Profile* profile) { NOTIMPLEMENTED(); }
 
 GURL NewTabUIURL() {
   NOTIMPLEMENTED();
-  return GURL();
+  // TODO(port): returning a blank URL here confuses the page IDs so make sure 
+  // we load something
+  return GURL("http://dev.chromium.org");
 }
 
 //--------------------------------------------------------------------------
@@ -174,23 +176,6 @@ void UninstallJankometer() {
 
 //--------------------------------------------------------------------------
 
-void Browser::Observe(NotificationType type,
-                      const NotificationSource& source,
-                      const NotificationDetails& details) {
-  NOTIMPLEMENTED();
-}
-
-GURL Browser::GetHomePage() {
-  NOTIMPLEMENTED();
-  return GURL("http://dev.chromium.org");
-}
-
-void Browser::LoadingStateChanged(TabContents* source) {
-  NOTIMPLEMENTED();
-}
-
-//--------------------------------------------------------------------------
-
 TabContents* TabContents::CreateWithType(TabContentsType type,
                                          Profile* profile,
                                          SiteInstance* instance) {
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index 0520df2..fdd0d48 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -78,6 +78,7 @@ class SessionID;
 class SiteInstance;
 class SpellChecker;
 class TabContents;
+class TabContentsDelegate;
 class TabNavigation;
 struct ThumbnailScore;
 class Task;
@@ -405,6 +406,7 @@ class StatusBubble {
  public:
   void SetStatus(const std::wstring&) { NOTIMPLEMENTED(); }
   void Hide() { NOTIMPLEMENTED(); }
+  void SetURL(const GURL&, const std::wstring&) { NOTIMPLEMENTED(); }
 };
 
 class SavePackage : public base::RefCountedThreadSafe<SavePackage>,
@@ -466,62 +468,6 @@ class FaviconStatus {
   GURL url_;
 };
 
-class TabContentsDelegate {
- public:
-  virtual void OpenURLFromTab(TabContents* source,
-                              const GURL& url, const GURL& referrer,
-                              WindowOpenDisposition disposition,
-                              PageTransition::Type transition) {
-    NOTIMPLEMENTED();
-  }
-  virtual void OpenURL(const GURL& url, const GURL& referrer,
-                       WindowOpenDisposition disposition,
-                       PageTransition::Type transition) {
-    OpenURLFromTab(NULL, url, referrer, disposition, transition);
-  }
-  virtual void UpdateTargetURL(TabContents*, const GURL&) { NOTIMPLEMENTED(); }
-  virtual void CloseContents(TabContents*) { NOTIMPLEMENTED(); }
-  virtual void MoveContents(TabContents*, const gfx::Rect&) {
-    NOTIMPLEMENTED();
-  }
-  virtual bool IsPopup(TabContents*) {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  virtual void ForwardMessageToExternalHost(const std::string&,
-                                            const std::string&) {
-    NOTIMPLEMENTED();
-  }
-  virtual TabContents* GetConstrainingContents(TabContents*) {
-    NOTIMPLEMENTED();
-    return NULL;
-  }
-  virtual void ShowHtmlDialog(ModalHtmlDialogDelegate*, void*) {
-    NOTIMPLEMENTED();
-  }
-  virtual bool CanBlur() {
-    NOTIMPLEMENTED();
-    return true;
-  }
-  virtual gfx::Rect GetRootWindowResizerRect() const {
-    return gfx::Rect();
-  }
-
-  virtual bool IsExternalTabContainer() {
-    NOTIMPLEMENTED();
-    return false;
-  }
-  virtual void BeforeUnloadFired(WebContents*, bool, bool*) {
-    NOTIMPLEMENTED();
-  }
-  virtual void URLStarredChanged(WebContents*, bool) { NOTIMPLEMENTED(); }
-  virtual void ConvertContentsToApplication(WebContents*) { NOTIMPLEMENTED(); }
-  virtual void ReplaceContents(TabContents*, TabContents*) { NOTIMPLEMENTED(); }
-  virtual void NavigationStateChanged(const TabContents*, unsigned int) {
-    NOTIMPLEMENTED();
-  }
-};
-
 class InterstitialPage {
  public:
   InterstitialPage(WebContents* tab, bool new_navigation, const GURL& url) {
@@ -856,7 +802,11 @@ class ConstrainedWindow {
   void CloseConstrainedWindow() { NOTIMPLEMENTED(); }
 };
 
-class ModalHtmlDialogDelegate {
+class HtmlDialogContentsDelegate {
+ public:
+};
+
+class ModalHtmlDialogDelegate : public HtmlDialogContentsDelegate {
  public:
   ModalHtmlDialogDelegate(const GURL&, int, int, const std::string&,
                           IPC::Message*, WebContents*) { }