Merge 182751

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 71 matching lines @@
   virtual const std::vector<string16>& subtexts() const OVERRIDE;
   virtual const std::vector<string16>& icons() const OVERRIDE;
   virtual const std::vector<int>& identifiers() const OVERRIDE;
 #if !defined(OS_ANDROID)
   virtual const gfx::Font& GetNameFontForRow(size_t index) const OVERRIDE;
   virtual const gfx::Font& subtext_font() const OVERRIDE;
 #endif
   virtual int selected_line() const OVERRIDE;
   virtual bool delete_icon_hovered() const OVERRIDE;
 
-  // Like Hide(), but doesn't invalidate |delegate_| (the delegate will still
-  // be informed of destruction).
-  void HideInternal();
-
   // Change which line is currently selected by the user.
   void SetSelectedLine(int selected_line);
 
   // Increase the selected line by 1, properly handling wrapping.
   void SelectNextLine();
 
   // Decrease the selected line by 1, properly handling wrapping.
   void SelectPreviousLine();
 
   // The user has choosen the selected line.
@@ skipping 97 matching lines @@
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
   // Used to indicate if the delete icon within a row is currently selected.
   bool delete_icon_hovered_;
 
   // True if |HideInternal| has already been called.
   bool is_hiding_;
 
-  // True if the delegate should be informed when |this| is destroyed.
-  bool inform_delegate_of_destruction_;
-
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_