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

chrome/browser/autofill/autofill_manager.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_
 #pragma once
 
 #include <list>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
 #include "chrome/browser/autofill/autofill_download.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "ipc/ipc_channel.h"
+#include "chrome/browser/tab_contents/web_navigation_observer.h"
 
 class AutoFillCCInfoBarDelegate;
 class AutoFillProfile;
 class AutoFillMetrics;
 class CreditCard;
 class FormStructure;
 class PrefService;
 class RenderViewHost;
-class TabContents;
 
 namespace webkit_glue {
 struct FormData;
 class FormField;
 }  // namespace webkit_glue
 
 // Manages saving and restoring the user's personal information entered into web
 // forms.
-class AutoFillManager : public IPC::Channel::Listener,
+class AutoFillManager : public WebNavigationObserver,
                         public AutoFillDownloadManager::Observer {
  public:
   explicit AutoFillManager(TabContents* tab_contents);
   virtual ~AutoFillManager();
 
   // Registers our browser prefs.
   static void RegisterBrowserPrefs(PrefService* prefs);
 
   // Registers our Enable/Disable AutoFill pref.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Returns the TabContents hosting this AutoFillManager.
   TabContents* tab_contents() const { return tab_contents_; }
 
-  // IPC::Channel::Listener implementation.
+  // WebNavigationObserver implementation.
+  virtual void DidNavigateMainFramePostCommit(
+      const NavigationController::LoadCommittedDetails& details,
+      const ViewHostMsg_FrameNavigate_Params& params);
+  virtual void TranslateStarted();
   virtual bool OnMessageReceived(const IPC::Message& message);
 
   // Called by the AutoFillCCInfoBarDelegate when the user interacts with the
   // infobar.
   virtual void OnInfoBarClosed(bool should_save);
 
   // AutoFillDownloadManager::Observer implementation:
   virtual void OnLoadedAutoFillHeuristics(const std::string& heuristic_xml);
   virtual void OnUploadedAutoFillHeuristics(const std::string& form_signature);
   virtual void OnHeuristicsRequestError(
       const std::string& form_signature,
       AutoFillDownloadManager::AutoFillRequestType request_type,
       int http_error);
 
   // Returns the value of the AutoFillEnabled pref.
   virtual bool IsAutoFillEnabled() const;
 
   // Handles the form data submitted by the user.
   void HandleSubmit();
 
   // Uploads the form data to the AutoFill server.
   void UploadFormData();
 
-  // Reset cache.
-  void Reset();
-
  protected:
   // For tests.
   AutoFillManager();
   AutoFillManager(TabContents* tab_contents,
                   PersonalDataManager* personal_data);
 
+  // Reset cache.
+  void Reset();
+
   void set_personal_data_manager(PersonalDataManager* personal_data) {
     personal_data_ = personal_data;
   }
 
   const AutoFillMetrics* metric_logger() const {
     return metric_logger_.get();
   }
   void set_metric_logger(const AutoFillMetrics* metric_logger);
 
   ScopedVector<FormStructure>* form_structures() { return &form_structures_; }
@@ skipping 131 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(AutoFillManagerTest, FormChangesAddField);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetrics);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest,
                            NoQualityMetricsForNonAutoFillableForms);
   FRIEND_TEST_ALL_PREFIXES(AutoFillMetricsTest, QualityMetricsForFailure);
 
   DISALLOW_COPY_AND_ASSIGN(AutoFillManager);
 };
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_MANAGER_H_