Fix autofill popup controller key press callback registration

chrome/browser/ui/autofill/autofill_popup_controller_impl.cc

 // Copyright (c) 2012 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/autofill_popup_controller_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/command_line.h"
+#include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_view.h"
+#include "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/text_elider.h"
 #include "ui/gfx/text_utils.h"
 
 using base::WeakPtr;
 
 namespace autofill {
 namespace {
 
 // Used to indicate that no line is currently selected by the user.
 const int kNoSelection = -1;
 
 }  // namespace
 
 // static
 WeakPtr<AutofillPopupControllerImpl> AutofillPopupControllerImpl::GetOrCreate(
     WeakPtr<AutofillPopupControllerImpl> previous,
     WeakPtr<AutofillPopupDelegate> delegate,
     content::WebContents* web_contents,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction) {
-  if (previous.get() && previous->web_contents() == web_contents &&
-      previous->delegate_.get() == delegate.get() &&
+  if (previous.get() && previous->delegate_.get() == delegate.get() &&
       previous->container_view() == container_view &&
       previous->element_bounds() == element_bounds) {
     previous->ClearState();
     return previous;
   }
 
   if (previous.get())
     previous->Hide();
 
   AutofillPopupControllerImpl* controller =
       new AutofillPopupControllerImpl(
           delegate, web_contents, container_view, element_bounds,
           text_direction);
   return controller->GetWeakPtr();
 }
 
 AutofillPopupControllerImpl::AutofillPopupControllerImpl(
     base::WeakPtr<AutofillPopupDelegate> delegate,
     content::WebContents* web_contents,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction)
-    : controller_common_(new PopupControllerCommon(element_bounds,
-                                                   text_direction,
-                                                   container_view,
-                                                   web_contents)),
+    : controller_common_(element_bounds, text_direction, container_view),
       view_(NULL),
       layout_model_(this, delegate->IsCreditCardPopup()),
       delegate_(delegate),
       weak_ptr_factory_(this) {
   ClearState();
-  controller_common_->SetKeyPressCallback(
-      base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
-                 base::Unretained(this)));
 }
 
 AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {}
 
 void AutofillPopupControllerImpl::Show(
     const std::vector<autofill::Suggestion>& suggestions) {
   SetValues(suggestions);
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 
@@ skipping 23 matching lines @@
         i, layout_model_.GetAvailableWidthForRow(i, has_label));
   }
 #endif
 
   if (just_created) {
     ShowView();
   } else {
     UpdateBoundsAndRedrawPopup();
   }
 
-  controller_common_->RegisterKeyPressCallback();
+  static_cast<ContentAutofillDriver*>(delegate_->GetAutofillDriver())
+      ->RegisterKeyPressHandler(
+          base::Bind(&AutofillPopupControllerImpl::HandleKeyPressEvent,
+                     base::Unretained(this)));
   delegate_->OnPopupShown();
 
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 }
 
 void AutofillPopupControllerImpl::UpdateDataListValues(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
@@ skipping 51 matching lines @@
     elided_values_[i] = values[i];
     elided_labels_[i] = labels[i];
   }
 
   UpdateBoundsAndRedrawPopup();
   DCHECK_EQ(suggestions_.size(), elided_values_.size());
   DCHECK_EQ(suggestions_.size(), elided_labels_.size());
 }
 
 void AutofillPopupControllerImpl::Hide() {
-  controller_common_->RemoveKeyPressCallback();
-  if (delegate_)
+  if (delegate_) {
     delegate_->OnPopupHidden();
+    static_cast<ContentAutofillDriver*>(delegate_->GetAutofillDriver())
+        ->RemoveKeyPressHandler();
+  }
 
   if (view_)
     view_->Hide();
 
   delete this;
 }
 
 void AutofillPopupControllerImpl::ViewDestroyed() {
   // The view has already been destroyed so clear the reference to it.
   view_ = NULL;
@@ skipping 76 matching lines @@
 void AutofillPopupControllerImpl::AcceptSuggestion(size_t index) {
   const autofill::Suggestion& suggestion = suggestions_[index];
   delegate_->DidAcceptSuggestion(suggestion.value, suggestion.frontend_id,
                                  index);
 }
 
 gfx::Rect AutofillPopupControllerImpl::popup_bounds() const {
   return layout_model_.popup_bounds();
 }
 
-content::WebContents* AutofillPopupControllerImpl::web_contents() {
-  return controller_common_->web_contents();
-}
-
 gfx::NativeView AutofillPopupControllerImpl::container_view() {
-  return controller_common_->container_view();
+  return controller_common_.container_view;
 }
 
 const gfx::RectF& AutofillPopupControllerImpl::element_bounds() const {
-  return controller_common_->element_bounds();
+  return controller_common_.element_bounds;
 }
 
 bool AutofillPopupControllerImpl::IsRTL() const {
-  return controller_common_->is_rtl();
+  return controller_common_.text_direction == base::i18n::RIGHT_TO_LEFT;
 }
 
 const std::vector<autofill::Suggestion>
 AutofillPopupControllerImpl::GetSuggestions() {
   return suggestions_;
 }
 
 #if !defined(OS_ANDROID)
 int AutofillPopupControllerImpl::GetElidedValueWidthForRow(size_t row) {
   return gfx::GetStringWidth(GetElidedValueAt(row),
@@ skipping 211 matching lines @@
   // Don't clear view_, because otherwise the popup will have to get regenerated
   // and this will cause flickering.
   suggestions_.clear();
   elided_values_.clear();
   elided_labels_.clear();
 
   selected_line_ = kNoSelection;
 }
 
 }  // namespace autofill