add infobar_delegate.cc to the build

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


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

6 files changed, 25 insertions, 26 deletions

diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index f6ed585..401affd 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -749,7 +749,6 @@ if not env.Bit('windows'):
       'sessions/session_backend.cc',
       'sessions/session_restore.cc',
       'shell_integration.cc',
-      'tab_contents/infobar_delegate.cc',
       'tab_contents/interstitial_page.cc',
       'tab_contents/native_ui_contents.cc',
       'tab_contents/render_view_context_menu.cc',
diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc
index eaeb013..a39bdfa 100644
--- a/chrome/browser/tab_contents/infobar_delegate.cc
+++ b/chrome/browser/tab_contents/infobar_delegate.cc
@@ -5,13 +5,19 @@
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 
 #include "base/logging.h"
+#include "build/build_config.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/l10n_util.h"
 
 #include "generated_resources.h"
 
+#if defined(OS_WIN)
+#include "chrome/browser/tab_contents/tab_contents.h"
+#else
+#include "chrome/common/temp_scaffolding_stubs.h"
+#endif
+
 // InfoBarDelegate: ------------------------------------------------------------
 
 bool InfoBarDelegate::ShouldExpire(
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index d84e563..c1bf3fa 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -9,11 +9,6 @@
 
 #include "build/build_config.h"
 
-#if defined(OS_POSIX)
-// TODO(port): remove when dependent classes are ported
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
 #include "base/linked_ptr.h"
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/chrome.xcodeproj/project.pbxproj b/chrome/chrome.xcodeproj/project.pbxproj
index 9bad43b..e3eff53 100644
--- a/chrome/chrome.xcodeproj/project.pbxproj
+++ b/chrome/chrome.xcodeproj/project.pbxproj
@@ -287,6 +287,7 @@
 		8CB218DCFAC761AC876C6531 /* ssl_blocking_page.cc in Sources */ = {isa = PBXBuildFile; fileRef = B5D16ECB0F21451600861FAC /* ssl_blocking_page.cc */; };
 		8F51B73AAAF1772ECF9BD180 /* url_fetcher.cc in Sources */ = {isa = PBXBuildFile; fileRef = 778D7927798B7E3FAA498D3D /* url_fetcher.cc */; };
 		94542322A5E5A8F4FDDAB7F0 /* render_view_host_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = A76E42AD0F28EDB5009A7E88 /* render_view_host_manager.cc */; };
+		96DF109FEE9B09B11690F1FA /* infobar_delegate.cc in Sources */ = {isa = PBXBuildFile; fileRef = B6CCB9CF0F1EC32700106F0D /* infobar_delegate.cc */; };
 		97DD178B77011735FE4399E9 /* file_descriptor_set_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = D74DA6A9031CAE292790BD5E /* file_descriptor_set_unittest.cc */; };
 		9E85B39CA40439D93CE52E60 /* fav_icon_helper.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D7BF8760E9D4839009A6919 /* fav_icon_helper.cc */; };
 		A0BC9272AD709E86D492DAEC /* bookmark_storage.cc in Sources */ = {isa = PBXBuildFile; fileRef = D941DBEFD8B8B537DE8A4DAE /* bookmark_storage.cc */; };
@@ -5369,6 +5370,7 @@
 				4D7BFA1F0E9D4901009A6919 /* history_types.cc in Sources */,
 				4D7BFA240E9D4905009A6919 /* in_memory_database.cc in Sources */,
 				4D7BFA260E9D4908009A6919 /* in_memory_history_backend.cc in Sources */,
+				96DF109FEE9B09B11690F1FA /* infobar_delegate.cc in Sources */,
 				E45075B70F1505DD003BE099 /* keyword_provider.cc in Sources */,
 				4D7BF9A00E9D4875009A6919 /* meta_table_helper.cc in Sources */,
 				B555B2230F21506300F751B9 /* metrics_log.cc in Sources */,
diff --git a/chrome/common/temp_scaffolding_stubs.cc b/chrome/common/temp_scaffolding_stubs.cc
index 89af029..2c7ee7c 100644
--- a/chrome/common/temp_scaffolding_stubs.cc
+++ b/chrome/common/temp_scaffolding_stubs.cc
@@ -498,3 +498,18 @@ MemoryDetails::MemoryDetails() {
 void MemoryDetails::StartFetch() {
   NOTIMPLEMENTED();
 }
+
+InfoBar* ConfirmInfoBarDelegate::CreateInfoBar() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+InfoBar* AlertInfoBarDelegate::CreateInfoBar() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+InfoBar* LinkInfoBarDelegate::CreateInfoBar() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
diff --git a/chrome/common/temp_scaffolding_stubs.h b/chrome/common/temp_scaffolding_stubs.h
index dd5271f..c65e788 100644
--- a/chrome/common/temp_scaffolding_stubs.h
+++ b/chrome/common/temp_scaffolding_stubs.h
@@ -34,6 +34,7 @@
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ssl/ssl_error_info.h"
 #include "chrome/browser/ssl/ssl_manager.h"
+#include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/tab_contents/tab_contents_type.h"
@@ -636,20 +637,6 @@ class InterstitialPage {
   }
 };
 
-class InfoBarDelegate {
-};
-
-class ConfirmInfoBarDelegate : public InfoBarDelegate {
- public:
-  explicit ConfirmInfoBarDelegate(TabContents* contents) {}
-
-  enum InfoBarButton {
-    BUTTON_NONE = 0,
-    BUTTON_OK,
-    BUTTON_CANCEL
-  };
-};
-
 class TabContents : public PageNavigator, public NotificationObserver {
  public:
   enum InvalidateTypes {
@@ -998,11 +985,6 @@ class CharacterEncoding {
   }
 };
 
-class SimpleAlertInfoBarDelegate : public InfoBarDelegate {
- public:
-  SimpleAlertInfoBarDelegate(WebContents*, const std::wstring&, void*) {}
-};
-
 #if defined(OS_MACOSX)
 class FindBarMac {
  public: