In components/autofill, move notification handling into content driver.

components/autofill/core/browser/autofill_external_delegate.h

 // Copyright 2013 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 COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/password_autofill_manager.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "ui/gfx/rect.h"
 
 namespace gfx {
 class Rect;
 }
 
 namespace content {
 class RenderViewHost;
 class WebContents;
 }
 
 namespace autofill {
 
 class AutofillManager;
 
 // TODO(csharp): A lot of the logic in this class is copied from autofillagent.
 // Once Autofill is moved out of WebKit this class should be the only home for
 // this logic. See http://crbug.com/51644
 
 // Delegate for in-browser Autocomplete and Autofill display and selection.
 class AutofillExternalDelegate
-    : public content::NotificationObserver,
-      public AutofillPopupDelegate {
+    : public AutofillPopupDelegate {
  public:
   // Creates an AutofillExternalDelegate for the specified contents; the second
   // argument is an AutofillManager managing Autofill for that WebContents.
   AutofillExternalDelegate(content::WebContents* web_contents,
                            AutofillManager* autofill_manager);
   virtual ~AutofillExternalDelegate();
 
   // AutofillPopupDelegate implementation.
   virtual void OnPopupShown(content::KeyboardListener* listener) OVERRIDE;
   virtual void OnPopupHidden(content::KeyboardListener* listener) OVERRIDE;
@@ skipping 78 matching lines @@
                             std::vector<base::string16>* autofill_icons,
                             std::vector<int>* autofill_unique_ids);
 
   // Insert the data list values at the start of the given list, including
   // any required separators.
   void InsertDataListValues(std::vector<base::string16>* autofill_values,
                             std::vector<base::string16>* autofill_labels,
                             std::vector<base::string16>* autofill_icons,
                             std::vector<int>* autofill_unique_ids);
 
-  // content::NotificationObserver method override.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
-
   // The web_contents associated with this delegate.
   content::WebContents* web_contents_;  // weak; owns me.
   AutofillManager* autofill_manager_;  // weak.
 
   // Password Autofill manager, handles all password-related Autofilling.
   PasswordAutofillManager password_autofill_manager_;
 
   // The ID of the last request sent for form field Autofill.  Used to ignore
   // out of date responses.
   int autofill_query_id_;
 
-  // A scoped container for notification registries.
-  content::NotificationRegistrar registrar_;
-
   // The current form and field selected by Autofill.
   FormData autofill_query_form_;
   FormFieldData autofill_query_field_;
 
   // The bounds of the form field that user is interacting with.
   gfx::RectF element_bounds_;
 
   // Should we display a warning if Autofill is disabled?
   bool display_warning_if_disabled_;
 
@@ skipping 15 matching lines @@
   std::vector<int> data_list_unique_ids_;
 
   base::WeakPtrFactory<AutofillExternalDelegate> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillExternalDelegate);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_EXTERNAL_DELEGATE_H_