Merge 182751

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();
+  if (is_hiding_)
+    return;
+  is_hiding_ = true;
+
+  SetSelectedLine(kNoSelection);
+
+  delegate_->OnPopupHidden(this);
+
+  if (view_)
+    view_->Hide();
+  else
+    delete this;
 }
 
 bool AutofillPopupControllerImpl::HandleKeyPressEvent(
     const content::NativeWebKeyboardEvent& event) {
   switch (event.windowsKeyCode) {
     case ui::VKEY_UP:
       SelectPreviousLine();
       return true;
     case ui::VKEY_DOWN:
       SelectNextLine();
       return true;
     case ui::VKEY_PRIOR:  // Page up.
       SetSelectedLine(0);
       return true;
     case ui::VKEY_NEXT:  // Page down.
       SetSelectedLine(names().size() - 1);
       return true;
     case ui::VKEY_ESCAPE:
-      HideInternal();
+      Hide();
       return true;
     case ui::VKEY_DELETE:
       return (event.modifiers & content::NativeWebKeyboardEvent::ShiftKey) &&
              RemoveSelectedLine();
     case ui::VKEY_RETURN:
       return AcceptSelectedLine();
     default:
       return false;
   }
 }
@@ skipping 121 matching lines @@
 #endif
 
 int AutofillPopupControllerImpl::selected_line() const {
   return selected_line_;
 }
 
 bool AutofillPopupControllerImpl::delete_icon_hovered() const {
   return delete_icon_hovered_;
 }
 
-void AutofillPopupControllerImpl::HideInternal() {
-  if (is_hiding_)
-    return;
-  is_hiding_ = true;
-
-  SetSelectedLine(kNoSelection);
-
-  if (inform_delegate_of_destruction_)
-    delegate_->OnPopupHidden(this);
-
-  if (view_)
-    view_->Hide();
-  else
-    delete this;
-}
-
 void AutofillPopupControllerImpl::SetSelectedLine(int selected_line) {
   if (selected_line_ == selected_line)
     return;
 
   if (selected_line_ != kNoSelection)
     InvalidateRow(selected_line_);
 
   if (selected_line != kNoSelection)
     InvalidateRow(selected_line);
 
@@ skipping 68 matching lines @@
   subtexts_.erase(subtexts_.begin() + selected_line_);
   icons_.erase(icons_.begin() + selected_line_);
   identifiers_.erase(identifiers_.begin() + selected_line_);
 
   SetSelectedLine(kNoSelection);
 
   if (HasSuggestions()) {
     delegate_->ClearPreviewedForm();
     UpdateBoundsAndRedrawPopup();
   } else {
-    HideInternal();
+    Hide();
   }
 
   return true;
 }
 
 int AutofillPopupControllerImpl::LineFromY(int y) {
   int current_height = 0;
 
   for (size_t i = 0; i < identifiers().size(); ++i) {
     current_height += GetRowHeightFromId(identifiers()[i]);
@@ skipping 210 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);
   }
 }