Move infobar handling to a tab helper.

chrome/browser/automation/automation_provider_observers.cc

 // Copyright (c) 2011 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/automation/automation_provider_observers.h"
 
 #include <deque>
 #include <string>
 #include <vector>
 
@@ skipping 15 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/metrics/metric_event_duration_details.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/balloon_host.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/printing/print_job.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 1319 matching lines @@
 
 void InfoBarCountObserver::Observe(int type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED ||
          type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED);
   CheckCount();
 }
 
 void InfoBarCountObserver::CheckCount() {
-  if (tab_contents_->infobar_count() != target_count_)
+  if (tab_contents_->infobar_tab_helper()->infobar_count() != target_count_)
     return;
 
   if (automation_) {
     AutomationMsg_WaitForInfoBarCount::WriteReplyParams(reply_message_.get(),
                                                         true);
     automation_->Send(reply_message_.release());
   }
   delete this;
 }
 
@@ skipping 896 matching lines @@
   pdm_->SetObserver(this);
   registrar_.Add(this, chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
                  NotificationService::AllSources());
 }
 
 AutofillFormSubmittedObserver::~AutofillFormSubmittedObserver() {
   pdm_->RemoveObserver(this);
 
   if (tab_contents_) {
     InfoBarDelegate* infobar = NULL;
-    if (tab_contents_->infobar_count() > 0 &&
-        (infobar = tab_contents_->GetInfoBarDelegateAt(0))) {
-      tab_contents_->RemoveInfoBar(infobar);
+    if (tab_contents_->infobar_tab_helper()->infobar_count() > 0 &&

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Can you pull the infobar_tab_helper() out to a temp?

+        (infobar =
+            tab_contents_->infobar_tab_helper()->GetInfoBarDelegateAt(0))) {
+      tab_contents_->infobar_tab_helper()->RemoveInfoBar(infobar);
     }
   }
 }
 
 void AutofillFormSubmittedObserver::OnPersonalDataChanged() {
   if (automation_) {
     AutomationJSONReply(automation_,
                         reply_message_.release()).SendSuccess(NULL);
   }
   delete this;
 }
 
 void AutofillFormSubmittedObserver::OnInsufficientFormData() {
   if (automation_) {
     AutomationJSONReply(automation_,
                         reply_message_.release()).SendSuccess(NULL);
   }
   delete this;
 }
 
 void AutofillFormSubmittedObserver::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   DCHECK(type == chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED);
   // Accept in the infobar.
   tab_contents_ = Source<TabContentsWrapper>(source).ptr();
   InfoBarDelegate* infobar = NULL;
-  if (!(infobar = tab_contents_->GetInfoBarDelegateAt(0))) {
+  if (!(infobar =

[Peter Kasting, 2011/08/31 18:47:32]

Nit: While here, remove this conditional entirely and just set the temp directly
-- this call cannot fail.

+            tab_contents_->infobar_tab_helper()->GetInfoBarDelegateAt(0))) {
     if (automation_) {
       AutomationJSONReply(
           automation_, reply_message_.release()).SendError(
               "Could not identify the infobar delegate.");
     }
     delete this;
     return;
   }
   ConfirmInfoBarDelegate* confirm_infobar;
   if (!(confirm_infobar = infobar->AsConfirmInfoBarDelegate())) {

[Peter Kasting, 2011/08/31 18:47:32]

Nit: While here, can you fix this conditional to assign above the conditional
and then just check the temp inside the conditional?

     if (automation_) {
       AutomationJSONReply(
           automation_, reply_message_.release()).SendError(
               "Infobar is not a confirm infobar.");
     }
     delete this;
     return;
   }
   if (!(confirm_infobar->Accept())) {

[Peter Kasting, 2011/08/31 18:47:32]

Nit: Extra parens

     if (automation_) {
       AutomationJSONReply(
           automation_, reply_message_.release()).SendError(
               "Could not accept in the infobar.");
     }
     delete this;
     return;
   }
 }
 
@@ skipping 350 matching lines @@
 void DragTargetDropAckNotificationObserver::Observe(
     int type,
     const NotificationSource& source,
     const NotificationDetails& details) {
   if (automation_) {
     AutomationJSONReply(automation_,
                         reply_message_.release()).SendSuccess(NULL);
   }
   delete this;
 }