Move infobar handling to a tab helper.

chrome/browser/automation/testing_automation_provider.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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 35 matching lines @@
 #include "chrome/browser/download/download_prefs.h"
 #include "chrome/browser/download/save_package_file_picker.h"
 #include "chrome/browser/extensions/extension_browser_event_router.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_updater.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/importer/importer_host.h"
 #include "chrome/browser/importer/importer_list.h"
+#include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/password_manager/password_store.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 1808 matching lines @@
     }
   }
   *success = false;
 }
 
 void TestingAutomationProvider::GetInfoBarCount(int handle, size_t* count) {
   *count = static_cast<size_t>(-1);  // -1 means error.
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* nav_controller = tab_tracker_->GetResource(handle);
     if (nav_controller) {
       TabContentsWrapper* wrapper =

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

Nit: Just combine these two lines

           TabContentsWrapper::GetCurrentWrapperForContents(
               nav_controller->tab_contents());
-      *count = wrapper->infobar_count();
+      *count = wrapper->infobar_tab_helper()->infobar_count();
     }
   }
 }
 
 void TestingAutomationProvider::ClickInfoBarAccept(
     int handle,
     size_t info_bar_index,
     bool wait_for_navigation,
     IPC::Message* reply_message) {
   bool success = false;
   if (tab_tracker_->ContainsHandle(handle)) {
     NavigationController* nav_controller = tab_tracker_->GetResource(handle);
     if (nav_controller) {
       TabContentsWrapper* wrapper =

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

Nit: Convert this TCW* temp into an InfoBarTabHelper*

           TabContentsWrapper::GetCurrentWrapperForContents(
               nav_controller->tab_contents());
-      if (info_bar_index < wrapper->infobar_count()) {
+      if (info_bar_index < wrapper->infobar_tab_helper()->infobar_count()) {
         if (wait_for_navigation) {
           new NavigationNotificationObserver(nav_controller, this,
                                              reply_message, 1, false, false);
         }
         InfoBarDelegate* delegate =
             TabContentsWrapper::GetCurrentWrapperForContents(
-                nav_controller->tab_contents())->GetInfoBarDelegateAt(
-                    info_bar_index);
+                nav_controller->tab_contents())->infobar_tab_helper()->
+                    GetInfoBarDelegateAt(info_bar_index);
         if (delegate->AsConfirmInfoBarDelegate())
           delegate->AsConfirmInfoBarDelegate()->Accept();
         success = true;
       }
     }
   }
 
   // This "!wait_for_navigation || !success condition" logic looks suspicious.
   // It will send a failure message when success is true but
   // |wait_for_navigation| is false.
@@ skipping 597 matching lines @@
     rect.set_width(width);
   if (args->GetInteger("height", &height))
     rect.set_height(height);
   browser->window()->SetBounds(rect);
   AutomationJSONReply(this, reply_message).SendSuccess(NULL);
 }
 
 ListValue* TestingAutomationProvider::GetInfobarsInfo(TabContents* tc) {
   // Each infobar may have different properties depending on the type.
   ListValue* infobars = new ListValue;
   TabContentsWrapper* wrapper =

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

Nit: Convert this TCW* temp into an InfoBarTabHelper*

       TabContentsWrapper::GetCurrentWrapperForContents(tc);
-  for (size_t i = 0; i < wrapper->infobar_count(); ++i) {
+  for (size_t i = 0; i < wrapper->infobar_tab_helper()->infobar_count(); ++i) {
     DictionaryValue* infobar_item = new DictionaryValue;
-    InfoBarDelegate* infobar = wrapper->GetInfoBarDelegateAt(i);
+    InfoBarDelegate* infobar =
+        wrapper->infobar_tab_helper()->GetInfoBarDelegateAt(i);
     if (infobar->AsConfirmInfoBarDelegate()) {
       // Also covers ThemeInstalledInfoBarDelegate.
       infobar_item->SetString("type", "confirm_infobar");
       ConfirmInfoBarDelegate* confirm_infobar =
         infobar->AsConfirmInfoBarDelegate();
       infobar_item->SetString("text", confirm_infobar->GetMessageText());
       infobar_item->SetString("link_text", confirm_infobar->GetLinkText());
       ListValue* buttons_list = new ListValue;
       int buttons = confirm_infobar->GetButtons();
       if (buttons & ConfirmInfoBarDelegate::BUTTON_OK) {
@@ skipping 51 matching lines @@
     return;
   }
   TabContentsWrapper* tab_contents =
       browser->GetTabContentsWrapperAt(tab_index);
   if (!tab_contents) {
     reply.SendError(StringPrintf("No such tab at index %d", tab_index));
     return;
   }
   InfoBarDelegate* infobar = NULL;
   size_t infobar_index = static_cast<size_t>(infobar_index_int);
-  if (infobar_index >= tab_contents->infobar_count() ||
-      !(infobar = tab_contents->GetInfoBarDelegateAt(infobar_index))) {
+  if (infobar_index >= tab_contents->infobar_tab_helper()->infobar_count() ||

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

Nit: Can you factor this infobar_tab_helper() out into a temp?

+      !(infobar = tab_contents->infobar_tab_helper()->

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

Nit: This assignment can be pulled out of the conditional and moved below it, as
it can't fail if the index check passes.

+            GetInfoBarDelegateAt(infobar_index))) {
     reply.SendError(StringPrintf("No such infobar at index %" PRIuS,
                                  infobar_index));
     return;
   }
   if ("dismiss" == action) {
     infobar->InfoBarDismissed();
-    tab_contents->RemoveInfoBar(infobar);
+    tab_contents->infobar_tab_helper()->RemoveInfoBar(infobar);
     reply.SendSuccess(NULL);
     return;
   }
   if ("accept" == action || "cancel" == action) {
     ConfirmInfoBarDelegate* confirm_infobar;
     if (!(confirm_infobar = infobar->AsConfirmInfoBarDelegate())) {
       reply.SendError("Not a confirm infobar");
       return;
     }
     if ("accept" == action) {
       if (confirm_infobar->Accept())
-        tab_contents->RemoveInfoBar(infobar);
+        tab_contents->infobar_tab_helper()->RemoveInfoBar(infobar);
     } else if ("cancel" == action) {
       if (confirm_infobar->Cancel())
-        tab_contents->RemoveInfoBar(infobar);
+        tab_contents->infobar_tab_helper()->RemoveInfoBar(infobar);
     }
     reply.SendSuccess(NULL);
     return;
   }
   reply.SendError("Invalid action");
 }
 
 namespace {
 
 // Task to get info about BrowserChildProcessHost. Must run on IO thread to
@@ skipping 1248 matching lines @@
   if (!tab_contents) {
     *error_message = StringPrintf("No tab at index %d.", tab_index);
     return NULL;
   }
   return tab_contents;
 }
 
 // Get the TranslateInfoBarDelegate from TabContents.
 TranslateInfoBarDelegate* GetTranslateInfoBarDelegate(
     TabContents* tab_contents) {
   TabContentsWrapper* wrapper =

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

Nit: Convert this TCW* temp into an InfoBarTabHelper*

       TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
-  for (size_t i = 0; i < wrapper->infobar_count(); i++) {
-    InfoBarDelegate* infobar = wrapper->GetInfoBarDelegateAt(i);
+  for (size_t i = 0; i < wrapper->infobar_tab_helper()->infobar_count(); i++) {
+    InfoBarDelegate* infobar =
+        wrapper->infobar_tab_helper()->GetInfoBarDelegateAt(i);
     if (infobar->AsTranslateInfoBarDelegate())
       return infobar->AsTranslateInfoBarDelegate();
   }
   // No translate infobar.
   return NULL;
 }
 
 }  // namespace
 
 void TestingAutomationProvider::FindInPage(
@@ skipping 181 matching lines @@
     if (!translate_bar->ShouldShowNeverTranslateButton()) {
       reply.SendError("Always translate button not showing.");
       return;
     }
     translate_bar->NeverTranslatePageLanguage();
     reply.SendSuccess(NULL);
   } else if (option == "decline_translation") {
     // This is the function called when an infobar is dismissed or when the
     // user clicks the 'Nope' translate button.
     translate_bar->TranslationDeclined();
-    tab_contents_wrapper->RemoveInfoBar(translate_bar);
+    tab_contents_wrapper->infobar_tab_helper()->RemoveInfoBar(translate_bar);
     reply.SendSuccess(NULL);
   } else {
     reply.SendError("Invalid string found for option.");
   }
 }
 
 // Sample json input: { "command": "GetBlockedPopupsInfo",
 //                      "tab_index": 1 }
 // Refer GetBlockedPopupsInfo() in pyauto.py for sample output.
 void TestingAutomationProvider::GetBlockedPopupsInfo(
@@ skipping 2217 matching lines @@
   IPC::ParamTraits<std::vector<GURL> >::Write(reply_message_, redirects_gurl);
 
   Send(reply_message_);
   redirect_query_ = 0;
   reply_message_ = NULL;
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   AutomationProviderList::GetInstance()->RemoveProvider(this);
 }