Always Close the Autofill UI through the same path

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
@@ skipping 29 matching lines @@
       gfx::NativeView container_view,
       const gfx::RectF& element_bounds);
 
   // Shows the popup, or updates the existing popup with the given values.
   void Show(const std::vector<string16>& names,
             const std::vector<string16>& subtexts,
             const std::vector<string16>& icons,
             const std::vector<int>& identifiers);
 
   // Hides the popup and destroys the controller. This also invalidates
-  // |delegate_|. Virtual for testing.
-  virtual void Hide();
+  // |delegate_|.
+  virtual void Hide() OVERRIDE;
 
   // KeyboardListener implementation.
   virtual bool HandleKeyPressEvent(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
 
  protected:
   FRIEND_TEST_ALL_PREFIXES(AutofillExternalDelegateBrowserTest,
                            CloseWidgetAndNoLeaking);
 
   AutofillPopupControllerImpl(AutofillPopupDelegate* delegate,
                               gfx::NativeView container_view,
                               const gfx::RectF& element_bounds);
   virtual ~AutofillPopupControllerImpl();
 
   // AutofillPopupController implementation.
-  virtual void ViewDestroyed() OVERRIDE;
   virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
   virtual void MouseHovered(int x, int y) OVERRIDE;
   virtual void MouseClicked(int x, int y) OVERRIDE;
   virtual void MouseExitedPopup() OVERRIDE;
   virtual void AcceptSuggestion(size_t index) OVERRIDE;
   virtual int GetIconResourceID(const string16& resource_name) OVERRIDE;
   virtual bool CanDelete(size_t index) const OVERRIDE;
   virtual gfx::Rect GetRowBounds(size_t index) OVERRIDE;
   virtual void SetPopupBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual const gfx::Rect& popup_bounds() const OVERRIDE;
@@ skipping 110 matching lines @@
   // The fonts for the popup text.
   gfx::Font name_font_;
   gfx::Font subtext_font_;
   gfx::Font warning_font_;
 #endif
 
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
-  // True if |HideInternal| has already been called.
-  bool is_hiding_;
-
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_