Merge 44481 - Ensure proper teardown of repost form warning objects....

chrome/browser/gtk/repost_form_warning_gtk.h

 // Copyright (c) 2010 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_GTK_REPOST_FORM_WARNING_GTK_H_
 #define CHROME_BROWSER_GTK_REPOST_FORM_WARNING_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "app/gtk_signal.h"
+#include "base/scoped_ptr.h"
 #include "chrome/browser/gtk/constrained_window_gtk.h"
 
 class RepostFormWarningController;
 
 // Displays a dialog that warns the user that they are about to resubmit
 // a form.
 // To display the dialog, allocate this object on the heap. It will open the
 // dialog from its constructor and then delete itself when the user dismisses
 // the dialog.
 class RepostFormWarningGtk : public ConstrainedDialogDelegate {
  public:
   RepostFormWarningGtk(GtkWindow* parent, TabContents* tab_contents);
 
   // ConstrainedDialogDelegate methods
   virtual GtkWidget* GetWidgetRoot();
 
   virtual void DeleteDelegate();
 
  private:
   virtual ~RepostFormWarningGtk();
 
-  void Dismiss();
-
   // Callbacks
   CHROMEGTK_CALLBACK_0(RepostFormWarningGtk, void, OnRefresh);
   CHROMEGTK_CALLBACK_0(RepostFormWarningGtk, void, OnCancel);
   CHROMEGTK_CALLBACK_1(RepostFormWarningGtk,
                        void,
                        OnHierarchyChanged,
                        GtkWidget*);
 
-  RepostFormWarningController* controller_;
+  scoped_ptr<RepostFormWarningController> controller_;
 
   GtkWidget* dialog_;
   GtkWidget* ok_;
   GtkWidget* cancel_;
 
   DISALLOW_COPY_AND_ASSIGN(RepostFormWarningGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_REPOST_FORM_WARNING_GTK_H_