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

chrome/browser/external_tab_container.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/external_tab_container.h"
 
 #include <string>
 
 #include "app/win_util.h"
 #include "base/i18n/rtl.h"
@@ skipping 36 matching lines @@
       tab_contents_(NULL),
       tab_contents_container_(NULL),
       tab_handle_(0),
       ignore_next_load_notification_(false),
       automation_resource_message_filter_(filter),
       load_requests_via_automation_(false),
       handle_top_level_requests_(false),
       external_method_factory_(this),
       enabled_extension_automation_(false),
       waiting_for_unload_event_(false),
-      pending_(false),
-      infobars_enabled_(true) {
+      pending_(false) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
   Uninitialize();
 }
 
 bool ExternalTabContainer::Init(Profile* profile,
                                 HWND parent,
                                 const gfx::Rect& bounds,
                                 DWORD style,
                                 bool load_requests_via_automation,
                                 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;
   }
 
   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);
   if (!IsWindow()) {
     NOTREACHED();
     return false;
   }
 
   // TODO(jcampan): limit focus traversal to contents.
 
@@ skipping 254 matching lines @@
   // an unwrapped Profile.
   bool result = new_container->Init(
       new_contents->profile()->GetOriginalProfile(),
       NULL,
       initial_pos,
       WS_CHILD,
       load_requests_via_automation_,
       handle_top_level_requests_,
       new_contents,
       GURL(),
-      GURL(),
-      true);
+      GURL());
 
   if (result) {
     uintptr_t cookie = reinterpret_cast<uintptr_t>(new_container.get());
     pending_tabs_[cookie] = new_container;
     new_container->set_pending(true);
     IPC::AttachExternalTabParams attach_params_;
     attach_params_.cookie = static_cast<uint64>(cookie);
     attach_params_.dimensions = initial_pos;
     attach_params_.user_gesture = user_gesture;
     attach_params_.disposition = disposition;
     automation_->Send(new AutomationMsg_AttachExternalTab(0,
         tab_handle_, attach_params_));
   } else {
     NOTREACHED();
   }
 }
 
 void ExternalTabContainer::TabContentsCreated(TabContents* new_contents) {
   RenderViewHost* rvh = new_contents->render_view_host();
   DCHECK(rvh != NULL);
 
   // Register this render view as a pending render view, i.e. any network
   // requests initiated by this render view would be serviced when the
   // external host connects to the new external tab instance.
   RegisterRenderViewHostForAutomation(rvh, true);
 }
 
-bool ExternalTabContainer::infobars_enabled() {
-  return infobars_enabled_;
-}
-
 void ExternalTabContainer::ActivateContents(TabContents* contents) {
 }
 
 void ExternalTabContainer::LoadingStateChanged(TabContents* source) {
 }
 
 void ExternalTabContainer::CloseContents(TabContents* source) {
   static const int kExternalTabCloseContentsDelayMS = 100;
 
   if (waiting_for_unload_event_) {
@@ skipping 558 matching lines @@
 
   layout->StartRow(0, 0);
   layout->AddView(info_bar_container);
   layout->StartRow(1, 0);
   layout->AddView(tab_contents_container_);
   SetContentsView(external_tab_view);
   // Note that SetTabContents must be called after AddChildView is called
   tab_contents_container_->ChangeTabContents(tab_contents_);
 }