Use WeakPtr to simplify AutofillPopupControllerImpl memory management

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"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "content/public/browser/keyboard_listener.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 
 class AutofillPopupDelegate;
 class AutofillPopupView;
 
 namespace gfx {
 class Display;
 }
 
 namespace ui {
 class KeyEvent;
 }
 
 // This class is a controller for an AutofillPopupView. It implements
 // AutofillPopupController to allow calls from AutofillPopupView. The
 // other, public functions are available to its instantiator.
 class AutofillPopupControllerImpl : public AutofillPopupController,
                                     public content::KeyboardListener {
  public:
   // Creates a new |AutofillPopupControllerImpl|, or reuses |previous| if
   // the construction arguments are the same. |previous| may be invalidated by
   // this call.
-  static AutofillPopupControllerImpl* GetOrCreate(
-      AutofillPopupControllerImpl* previous,
+  static base::WeakPtr<AutofillPopupControllerImpl> GetOrCreate(
+      base::WeakPtr<AutofillPopupControllerImpl> previous,
       AutofillPopupDelegate* delegate,
       gfx::NativeView container_view,
       const gfx::Rect& 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);
 
@@ skipping 32 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& name_font() 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 26 matching lines @@
 
   // Protected so tests can access.
 #if !defined(OS_ANDROID)
   // Calculates the desired width of the popup based on its contents.
   int GetDesiredPopupWidth() const;
 
   // Calculates the desired height of the popup based on its contents.
   int GetDesiredPopupHeight() const;
 #endif
 
+  base::WeakPtr<AutofillPopupControllerImpl> GetWeakPtr();
+
  private:
 #if !defined(OS_ANDROID)
   // Calculate the width of the row, excluding all the text. This provides
   // the size of the row that won't be reducible (since all the text can be
   // elided if there isn't enough space).
   int RowWidthWithoutText(int row) const;
 
   // Calculates and sets the bounds of the popup, including placing it properly
   // to prevent it from going off the screen.
   void UpdatePopupBounds();
@@ skipping 47 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_