Revert 42366 - Allow TabContentsDelegate classes to specify whether InfoBars are enabled.

Allow ChromeFrame to pass infobar enabled parameter to ExternalTabContainer.
BUG=2444936

Patch contributed by ericdingle@google.com
Original review at http://codereview.chromium.org/890005


TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/1205001

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

1 files changed, 3 insertions, 11 deletions

diff --git a/chrome/browser/external_tab_container.cc b/chrome/browser/external_tab_container.cc
index 4c46493..e6d1211 100644
--- a/chrome/browser/external_tab_container.cc
+++ b/chrome/browser/external_tab_container.cc
@@ -54,8 +54,7 @@ ExternalTabContainer::ExternalTabContainer(
       external_method_factory_(this),
       enabled_extension_automation_(false),
       waiting_for_unload_event_(false),
-      pending_(false),
-      infobars_enabled_(true) {
+      pending_(false) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
@@ -70,8 +69,7 @@ bool ExternalTabContainer::Init(Profile* profile,
                                 bool handle_top_level_requests,
                                 TabContents* existing_contents,
                                 const GURL& initial_url,
-                                const GURL& referrer,
-                                bool infobars_enabled) {
+                                const GURL& referrer) {
   if (IsWindow()) {
     NOTREACHED();
     return false;
@@ -79,7 +77,6 @@ bool ExternalTabContainer::Init(Profile* profile,
 
   load_requests_via_automation_ = load_requests_via_automation;
   handle_top_level_requests_ = handle_top_level_requests;
-  infobars_enabled_ = infobars_enabled;
 
   set_window_style(WS_POPUP | WS_CLIPCHILDREN);
   views::WidgetWin::Init(NULL, bounds);
@@ -354,8 +351,7 @@ void ExternalTabContainer::AddNewContents(TabContents* source,
       handle_top_level_requests_,
       new_contents,
       GURL(),
-      GURL(),
-      true);
+      GURL());
 
   if (result) {
     uintptr_t cookie = reinterpret_cast<uintptr_t>(new_container.get());
@@ -383,10 +379,6 @@ void ExternalTabContainer::TabContentsCreated(TabContents* new_contents) {
   RegisterRenderViewHostForAutomation(rvh, true);
 }
 
-bool ExternalTabContainer::infobars_enabled() {
-  return infobars_enabled_;
-}
-
 void ExternalTabContainer::ActivateContents(TabContents* contents) {
 }