Properly Remove Autofill Keyboard Listener.

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/logging.h"
@@ skipping 86 matching lines @@
     AutofillPopupDelegate* delegate,
     gfx::NativeView container_view,
     const gfx::RectF& element_bounds)
     : view_(NULL),
       delegate_(delegate),
       container_view_(container_view),
       element_bounds_(element_bounds),
       selected_line_(kNoSelection),
       delete_icon_hovered_(false),
       is_hiding_(false),
-      inform_delegate_of_destruction_(true),
       weak_ptr_factory_(this) {
 #if !defined(OS_ANDROID)
   subtext_font_ = name_font_.DeriveFont(kLabelFontSizeDelta);
   warning_font_ = name_font_.DeriveFont(0, gfx::Font::ITALIC);
 #endif
 }
 
 AutofillPopupControllerImpl::~AutofillPopupControllerImpl() {}
 
 void AutofillPopupControllerImpl::Show(
@@ skipping 46 matching lines @@
     view_ = AutofillPopupView::Create(this);
     ShowView();
   } else {
     UpdateBoundsAndRedrawPopup();
   }
 
   delegate_->OnPopupShown(this);
 }
 
 void AutofillPopupControllerImpl::Hide() {
-  inform_delegate_of_destruction_ = false;
   HideInternal();

[Ilya Sherman, 2013/02/12 21:15:25]

nit: No longer a need for HideInternal() to be distinct from Hide(); let's
collapse those two methods down into just one.

[csharp, 2013/02/12 21:21:19]

Done.

 }
 
 bool AutofillPopupControllerImpl::HandleKeyPressEvent(
     const content::NativeWebKeyboardEvent& event) {
   switch (event.windowsKeyCode) {
     case ui::VKEY_UP:
       SelectPreviousLine();
       return true;
     case ui::VKEY_DOWN:
       SelectNextLine();
@@ skipping 147 matching lines @@
   return delete_icon_hovered_;
 }
 
 void AutofillPopupControllerImpl::HideInternal() {
   if (is_hiding_)
     return;
   is_hiding_ = true;
 
   SetSelectedLine(kNoSelection);
 
-  if (inform_delegate_of_destruction_)
-    delegate_->OnPopupHidden(this);
+  delegate_->OnPopupHidden(this);
 
   if (view_)
     view_->Hide();
   else
     delete this;
 }
 
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
@@ skipping 306 matching lines @@
   if (bottom_available >= popup_required_height ||
       bottom_available >= top_available) {
     // The popup can appear below the field.
     return std::make_pair(bottom_growth_start, popup_required_height);
   } else {
     // The popup must appear above the field.
     return std::make_pair(top_growth_end - popup_required_height,
                           popup_required_height);
   }
 }