Clean up WebNavigationObserver by taking out password specific callbacks, and...

chrome/browser/tab_contents/tab_contents.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/tab_contents/tab_contents.h"
 
 #include <cmath>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 430 matching lines @@
 
   // Listen for Google URL changes
   registrar_.Add(this, NotificationType::GOOGLE_URL_UPDATED,
                  NotificationService::AllSources());
 
   // Set-up the showing of the omnibox search infobar if applicable.
   if (OmniboxSearchHint::IsEnabled(profile))
     omnibox_search_hint_.reset(new OmniboxSearchHint(this));
 
   autofill_manager_.reset(new AutoFillManager(this));
-  message_filters_.push_back(autofill_manager_.get());
+  AddNavigationObserver(autofill_manager_.get());
   autocomplete_history_manager_.reset(new AutocompleteHistoryManager(this));
-  message_filters_.push_back(autocomplete_history_manager_.get());
+  AddNavigationObserver(autocomplete_history_manager_.get());
 }
 
 TabContents::~TabContents() {
   is_being_destroyed_ = true;
 
   // We don't want any notifications while we're running our destructor.
   registrar_.RemoveAll();
   pref_change_registrar_.RemoveAll();
 
   NotifyDisconnected();
@@ skipping 99 matching lines @@
                                       IDS_MINIMUM_FONT_SIZE);
   prefs->RegisterLocalizedIntegerPref(prefs::kWebKitMinimumLogicalFontSize,
                                       IDS_MINIMUM_LOGICAL_FONT_SIZE);
   prefs->RegisterLocalizedBooleanPref(prefs::kWebKitUsesUniversalDetector,
                                       IDS_USES_UNIVERSAL_DETECTOR);
   prefs->RegisterLocalizedStringPref(prefs::kStaticEncodings,
                                      IDS_STATIC_ENCODING_LIST);
 }
 
 bool TabContents::OnMessageReceived(const IPC::Message& message) {
-  for (size_t i = 0; i < message_filters_.size(); ++i) {
-    if (message_filters_[i]->OnMessageReceived(message))
+  ObserverListBase<WebNavigationObserver>::Iterator it(
+      web_navigation_observers_);
+  WebNavigationObserver* observer;
+  while ((observer = it.GetNext()) != NULL)
+    if (observer->OnMessageReceived(message))
       return true;
-  }
 
   bool handled = true;
   bool message_is_ok = true;
   IPC_BEGIN_MESSAGE_MAP_EX(TabContents, message, message_is_ok)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidStartProvisionalLoadForFrame,
                         OnDidStartProvisionalLoadForFrame)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidRedirectProvisionalLoad,
                         OnDidRedirectProvisionalLoad)
     IPC_MESSAGE_HANDLER(ViewHostMsg_DidFailProvisionalLoadWithError,
                         OnDidFailProvisionalLoadWithError)
@@ skipping 1391 matching lines @@
   if (!net::RegistryControlledDomainService::SameDomainOrHost(
       details.previous_url, details.entry->url()))
     CloseConstrainedWindows();
 
   // Update the starred state.
   UpdateStarredStateForCurrentURL();
 
   // Notify observers about navigation.
   FOR_EACH_OBSERVER(WebNavigationObserver, web_navigation_observers_,
                     DidNavigateMainFramePostCommit(details, params));
-
-  // Clear the cache of forms in AutoFill.
-  autofill_manager_->Reset();
 }
 
 void TabContents::DidNavigateAnyFramePostCommit(
     RenderViewHost* render_view_host,
     const NavigationController::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
   // If we navigate, start showing messages again. This does nothing to prevent
   // a malicious script from spamming messages, since the script could just
   // reload the page to stop blocking.
   suppress_javascript_messages_ = false;
@@ skipping 918 matching lines @@
                                       const std::string& json_arguments,
                                       IPC::Message* reply_msg) {
   if (delegate()) {
     HtmlDialogUIDelegate* dialog_delegate =
         new ModalHtmlDialogDelegate(url, width, height, json_arguments,
                                     reply_msg, this);
     delegate()->ShowHtmlDialog(dialog_delegate, NULL);
   }
 }
 
-void TabContents::PasswordFormsFound(
-    const std::vector<webkit_glue::PasswordForm>& forms) {
-  FOR_EACH_OBSERVER(WebNavigationObserver, web_navigation_observers_,
-                    PasswordFormsFound(forms));
-}
-
-void TabContents::PasswordFormsVisible(
-    const std::vector<webkit_glue::PasswordForm>& visible_forms) {
-  FOR_EACH_OBSERVER(WebNavigationObserver, web_navigation_observers_,
-                    PasswordFormsVisible(visible_forms));
-}
-
 // Checks to see if we should generate a keyword based on the OSDD, and if
 // necessary uses TemplateURLFetcher to download the OSDD and create a keyword.
 void TabContents::PageHasOSDD(
     RenderViewHost* render_view_host,
     int32 page_id,
     const GURL& url,
     const ViewHostMsg_PageHasOSDD_Type& msg_provider_type) {
   // Make sure page_id is the current page and other basic checks.
   DCHECK(url.is_valid());
   if (!IsActiveEntry(page_id))
@@ skipping 435 matching lines @@
   if (pm != NULL) {
     if (pm->MaybeUsePreloadedPage(this, url)) {
       // TODO(tburkard): If the preloaded page has not finished preloading
       // yet, we should not do this.
       DidStopLoading();
       return true;
     }
   }
   return false;
 }