Merge 182751

chrome/browser/autofill/autofill_external_delegate.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 "base/utf_string_conversions.h"
 #include "chrome/browser/autofill/autocomplete_history_manager.h"
 #include "chrome/browser/autofill/autofill_external_delegate.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/common/autofill_messages.h"
@@ skipping 31 matching lines @@
 }
 
 AutofillExternalDelegate::AutofillExternalDelegate(
     content::WebContents* web_contents,
     AutofillManager* autofill_manager)
     : web_contents_(web_contents),
       autofill_manager_(autofill_manager),
       password_autofill_manager_(web_contents),
       autofill_query_id_(0),
       display_warning_if_disabled_(false),
-      has_shown_autofill_popup_for_current_edit_(false) {
+      has_shown_autofill_popup_for_current_edit_(false),
+      registered_keyboard_listener_with_(NULL) {
   registrar_.Add(this,
                  content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
                  content::Source<content::WebContents>(web_contents));
   if (web_contents) {
     registrar_.Add(
         this,
         content::NOTIFICATION_NAV_ENTRY_COMMITTED,
         content::Source<content::NavigationController>(
             &(web_contents->GetController())));
   }
@@ skipping 136 matching lines @@
     const std::vector<string16>& data_list_icons,
     const std::vector<int>& data_list_unique_ids) {
   data_list_values_ = data_list_values;
   data_list_labels_ = data_list_labels;
   data_list_icons_ = data_list_icons;
   data_list_unique_ids_ = data_list_unique_ids;
 }
 
 void AutofillExternalDelegate::OnPopupShown(
     content::KeyboardListener* listener) {
-  if (web_contents_)
-    web_contents_->GetRenderViewHost()->AddKeyboardListener(listener);
+  if (web_contents_ && !registered_keyboard_listener_with_) {
+    registered_keyboard_listener_with_ = web_contents_->GetRenderViewHost();
+    registered_keyboard_listener_with_->AddKeyboardListener(listener);
+  }
 }
 
 void AutofillExternalDelegate::OnPopupHidden(
     content::KeyboardListener* listener) {
-  if (web_contents_)
+  if (web_contents_ && registered_keyboard_listener_with_ ==
+      web_contents_->GetRenderViewHost())
     web_contents_->GetRenderViewHost()->RemoveKeyboardListener(listener);
+
+  registered_keyboard_listener_with_ = NULL;
 }
 
 void AutofillExternalDelegate::DidSelectSuggestion(int identifier) {
   ClearPreviewedForm();
 
   // Only preview the data if it is a profile.
   if (identifier > 0)
     FillAutofillFormData(identifier, true);
 }
 
@@ skipping 44 matching lines @@
 void AutofillExternalDelegate::ClearPreviewedForm() {
   if (web_contents_) {
     RenderViewHost* host = web_contents_->GetRenderViewHost();
 
     if (host)
       host->Send(new AutofillMsg_ClearPreviewedForm(host->GetRoutingID()));
   }
 }
 
 void AutofillExternalDelegate::HideAutofillPopup() {
-  if (controller_) {
+  if (controller_)
     controller_->Hide();
-    OnPopupHidden(controller_.get());
-  }
 }
 
 void AutofillExternalDelegate::Reset() {
   HideAutofillPopup();
 
   password_autofill_manager_.Reset();
 }
 
 void AutofillExternalDelegate::AddPasswordFormMapping(
       const FormFieldData& form,
@@ skipping 121 matching lines @@
     const content::NotificationDetails& details) {
   if (type == content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED) {
     if (!*content::Details<bool>(details).ptr())
       HideAutofillPopup();
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     HideAutofillPopup();
   } else {
     NOTREACHED();
   }
 }