Merge 132498 - GTK: Stop listening to gtk signals in the omnibox before destroying the model.

chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.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_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_
 #define CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
@@ skipping 14 matching lines @@
 class AutocompleteEditModel;
 class AutocompletePopupModel;
 class ThemeServiceGtk;
 class OmniboxView;
 class SkBitmap;
 
 namespace gfx {
 class Image;
 }
 
+namespace ui {
+class GtkSignalRegistrar;
+}
+
 class OmniboxPopupViewGtk : public AutocompletePopupView,
                             public content::NotificationObserver {
  public:
   OmniboxPopupViewGtk(const gfx::Font& font,
                       OmniboxView* omnibox_view,
                       AutocompleteEditModel* edit_model,
                       GtkWidget* location_bar);
   virtual ~OmniboxPopupViewGtk();
 
   // Overridden from AutocompletePopupView:
@@ skipping 49 matching lines @@
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleButtonPress,
                        GdkEventButton*);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleButtonRelease,
                        GdkEventButton*);
 
   CHROMEGTK_CALLBACK_1(OmniboxPopupViewGtk, gboolean, HandleExpose,
                        GdkEventExpose*);
 
+  scoped_ptr<ui::GtkSignalRegistrar> signal_registrar_;
   scoped_ptr<AutocompletePopupModel> model_;
   OmniboxView* omnibox_view_;
   GtkWidget* location_bar_;
 
   // Our popup window, which is the only widget used, and we paint it on our
   // own.  This widget shouldn't be exposed outside of this class.
   GtkWidget* window_;
   // The pango layout object created from the window, cached across exposes.
   PangoLayout* layout_;
 
@@ skipping 30 matching lines @@
   // erroneously ignore the next drag.
   bool ignore_mouse_drag_;
 
   // Whether our popup is currently open / shown, or closed / hidden.
   bool opened_;
 
   DISALLOW_COPY_AND_ASSIGN(OmniboxPopupViewGtk);
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_OMNIBOX_OMNIBOX_POPUP_VIEW_GTK_H_