Fix autofill popup controller key press callback registration

chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc

 // 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.
 
 #include "chrome/browser/ui/autofill/password_generation_popup_controller_impl.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversion_utils.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_observer.h"
 #include "chrome/browser/ui/autofill/password_generation_popup_view.h"
 #include "chrome/browser/ui/autofill/popup_constants.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator_params.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/autofill/content/browser/content_autofill_driver.h"
+#include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/password_generator.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/password_manager/core/browser/password_bubble_experiment.h"
 #include "components/password_manager/core/browser/password_manager.h"
 #include "components/password_manager/core/browser/password_manager_constants.h"
 #include "components/strings/grit/components_strings.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 11 matching lines @@
 PasswordGenerationPopupControllerImpl::GetOrCreate(
     base::WeakPtr<PasswordGenerationPopupControllerImpl> previous,
     const gfx::RectF& bounds,
     const PasswordForm& form,
     int max_length,
     password_manager::PasswordManager* password_manager,
     password_manager::PasswordManagerDriver* driver,
     PasswordGenerationPopupObserver* observer,
     content::WebContents* web_contents,
     gfx::NativeView container_view) {
-  if (previous.get() &&
-      previous->element_bounds() == bounds &&
-      previous->web_contents() == web_contents &&
+  if (previous.get() && previous->element_bounds() == bounds &&
+      previous->web_contents_ == web_contents &&
       previous->container_view() == container_view) {
     return previous;
   }
 
   if (previous.get())
     previous->Hide();
 
   PasswordGenerationPopupControllerImpl* controller =
       new PasswordGenerationPopupControllerImpl(
           bounds, form, max_length, password_manager, driver, observer,
@@ skipping 10 matching lines @@
     PasswordGenerationPopupObserver* observer,
     content::WebContents* web_contents,
     gfx::NativeView container_view)
     : view_(NULL),
       form_(form),
       password_manager_(password_manager),
       driver_(driver),
       observer_(observer),
       generator_(new PasswordGenerator(max_length)),
       // TODO(estade): use correct text direction.
-      controller_common_(bounds,
-                         base::i18n::LEFT_TO_RIGHT,
-                         container_view,
-                         web_contents),
+      controller_common_(bounds, base::i18n::LEFT_TO_RIGHT, container_view),
       password_selected_(false),
       display_password_(false),
+      web_contents_(web_contents),
       weak_ptr_factory_(this) {
-  controller_common_.SetKeyPressCallback(
-      base::Bind(&PasswordGenerationPopupControllerImpl::HandleKeyPressEvent,
-                 base::Unretained(this)));
-
   base::string16 link =
       l10n_util::GetStringUTF16(IDS_PASSWORD_MANAGER_SMART_LOCK);
   size_t offset = 0;
   help_text_ =
       l10n_util::GetStringFUTF16(IDS_PASSWORD_GENERATION_PROMPT, link, &offset);
   link_range_ = gfx::Range(offset, offset + link.length());
 }
 
 PasswordGenerationPopupControllerImpl::~PasswordGenerationPopupControllerImpl()
   {}
@@ skipping 81 matching lines @@
       return;
     }
 
     CalculateBounds();
     view_->Show();
   } else {
     CalculateBounds();
     view_->UpdateBoundsAndRedrawPopup();
   }
 
-  controller_common_.RegisterKeyPressCallback();
+  static_cast<ContentAutofillDriver*>(driver_->GetAutofillDriver())
+      ->RegisterKeyPressHandler(base::Bind(
+          &PasswordGenerationPopupControllerImpl::HandleKeyPressEvent,
+          base::Unretained(this)));
 
   if (observer_)
     observer_->OnPopupShown(display_password_);
 }
 
 void PasswordGenerationPopupControllerImpl::HideAndDestroy() {
   Hide();
 }
 
 void PasswordGenerationPopupControllerImpl::Hide() {
-  controller_common_.RemoveKeyPressCallback();
+  static_cast<ContentAutofillDriver*>(driver_->GetAutofillDriver())
+      ->RemoveKeyPressHandler();
 
   if (view_)
     view_->Hide();
 
   if (observer_)
     observer_->OnPopupHidden();
 
   delete this;
 }
 
 void PasswordGenerationPopupControllerImpl::ViewDestroyed() {
   view_ = NULL;
 
   Hide();
 }
 
 void PasswordGenerationPopupControllerImpl::OnSavedPasswordsLinkClicked() {
 #if defined(OS_ANDROID)
   chrome::android::PreferencesLauncher::ShowPasswordSettings();
 #else
   chrome::NavigateParams params(
-      chrome::FindBrowserWithWebContents(web_contents()),
+      chrome::FindBrowserWithWebContents(web_contents_),
       GURL(password_manager::kPasswordManagerAccountDashboardURL),
       ui::PAGE_TRANSITION_LINK);
   params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
 #endif
 }
 
 void PasswordGenerationPopupControllerImpl::SetSelectionAtPoint(
     const gfx::Point& point) {
   PasswordSelected(view_->IsPointInPasswordBounds(point));
 }
 
 bool PasswordGenerationPopupControllerImpl::AcceptSelectedLine() {
   if (!password_selected_)
     return false;
 
   PasswordAccepted();
   return true;
 }
 
 void PasswordGenerationPopupControllerImpl::SelectionCleared() {
   PasswordSelected(false);
 }
 
 gfx::NativeView PasswordGenerationPopupControllerImpl::container_view() {
-  return controller_common_.container_view();
+  return controller_common_.container_view;
 }
 
 gfx::Rect PasswordGenerationPopupControllerImpl::popup_bounds() const {
   return popup_bounds_;
 }
 
 const gfx::RectF& PasswordGenerationPopupControllerImpl::element_bounds()
     const {
-  return controller_common_.element_bounds();
+  return controller_common_.element_bounds;
 }
 
 bool PasswordGenerationPopupControllerImpl::IsRTL() const {
   return base::i18n::IsRTL();
 }
 
 const std::vector<autofill::Suggestion>
 PasswordGenerationPopupControllerImpl::GetSuggestions() {
   return std::vector<autofill::Suggestion>();
 }
@@ skipping 26 matching lines @@
 
 const base::string16& PasswordGenerationPopupControllerImpl::HelpText() {
   return help_text_;
 }
 
 const gfx::Range& PasswordGenerationPopupControllerImpl::HelpTextLinkRange() {
   return link_range_;
 }
 
 }  // namespace autofill