Fix autofill popup controller key press callback registration

components/autofill/content/browser/content_autofill_driver.h

 // Copyright 2014 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_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_H_
 #define COMPONENTS_AUTOFILL_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_H_
 
 #include <memory>
 #include <string>
 
 #include "base/supports_user_data.h"
+#include "components/autofill/content/browser/key_press_handler_manager.h"
 #include "components/autofill/content/common/autofill_agent.mojom.h"
 #include "components/autofill/content/common/autofill_driver.mojom.h"
 #include "components/autofill/core/browser/autofill_driver.h"
 #include "components/autofill/core/browser/autofill_external_delegate.h"
 #include "components/autofill/core/browser/autofill_manager.h"
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace content {
 class NavigationHandle;
 class RenderFrameHost;
 }
 
 namespace autofill {
 
 class AutofillClient;
 
 // Class that drives autofill flow in the browser process based on
 // communication from the renderer and from the external world. There is one
 // instance per RenderFrameHost.
 class ContentAutofillDriver : public AutofillDriver,
-                              public mojom::AutofillDriver {
+                              public mojom::AutofillDriver,
+                              public KeyPressHandlerManager::Delegate {
  public:
   ContentAutofillDriver(
       content::RenderFrameHost* render_frame_host,
       AutofillClient* client,
       const std::string& app_locale,
       AutofillManager::AutofillDownloadManagerState enable_download_manager);
   ~ContentAutofillDriver() override;
 
   // Gets the driver for |render_frame_host|.
   static ContentAutofillDriver* GetForRenderFrameHost(
@@ skipping 53 matching lines @@
 
   AutofillExternalDelegate* autofill_external_delegate() {
     return &autofill_external_delegate_;
   }
 
   AutofillManager* autofill_manager() { return autofill_manager_.get(); }
   content::RenderFrameHost* render_frame_host() { return render_frame_host_; }
 
   const mojom::AutofillAgentPtr& GetAutofillAgent();
 
+  // Methods forwarded to key_press_handler_manager_.
+  void RegisterKeyPressHandler(
+      const content::RenderWidgetHost::KeyPressEventCallback& handler);
+  void RemoveKeyPressHandler();
+
  protected:
   // Sets the manager to |manager| and sets |manager|'s external delegate
   // to |autofill_external_delegate_|. Takes ownership of |manager|.
   void SetAutofillManager(std::unique_ptr<AutofillManager> manager);
 
  private:
+  // KeyPressHandlerManager::Delegate:
+  void AddHandler(
+      const content::RenderWidgetHost::KeyPressEventCallback& handler) override;
+  void RemoveHandler(
+      const content::RenderWidgetHost::KeyPressEventCallback& handler) override;
+
   // Weak ref to the RenderFrameHost the driver is associated with. Should
   // always be non-NULL and valid for lifetime of |this|.
   content::RenderFrameHost* const render_frame_host_;
 
   // The per-tab client.
   AutofillClient* client_;
 
   // AutofillManager instance via which this object drives the shared Autofill
   // code.
   std::unique_ptr<AutofillManager> autofill_manager_;
 
   // AutofillExternalDelegate instance that this object instantiates in the
   // case where the Autofill native UI is enabled.
   AutofillExternalDelegate autofill_external_delegate_;
 
+  KeyPressHandlerManager key_press_handler_manager_;
+
   mojo::Binding<mojom::AutofillDriver> binding_;
 
   mojom::AutofillAgentPtr autofill_agent_;
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CONTENT_BROWSER_CONTENT_AUTOFILL_DRIVER_H_