diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 23:58:17 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-30 23:58:17 +0000 |
| commit | b112649635ba02ad951d15fcd21b607b660cac70 (patch) | |
| tree | 4f7cdec06969f705ad6336f84c1962f6bdd26ccd /views | |
| parent | 1bf2ac9712f06f3fac3f25f7abccd31e300687c5 (diff) | |
| download | chromium_src-b112649635ba02ad951d15fcd21b607b660cac70.zip chromium_src-b112649635ba02ad951d15fcd21b607b660cac70.tar.gz chromium_src-b112649635ba02ad951d15fcd21b607b660cac70.tar.bz2 | |
Fixes crash in ~WidgetGtk. This was caused by your change to no longer
set RootView::widget_ = NULL in RootView::OnWidgetDestroyed.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/150137
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/widget_gtk.h | 7 | ||||
| -rw-r--r-- | views/widget/widget_win.h | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/views/widget/widget_gtk.h b/views/widget/widget_gtk.h index 193910b..0034f01 100644 --- a/views/widget/widget_gtk.h +++ b/views/widget/widget_gtk.h @@ -209,11 +209,14 @@ class WidgetGtk : public Widget, public MessageLoopForUI::Observer { // popup that such GtkWidgets are parented to. static GtkWidget* null_parent_; + // The TooltipManager. + // WARNING: RootView's destructor calls into the TooltipManager. As such, this + // must be destroyed AFTER root_view_. + scoped_ptr<TooltipManagerGtk> tooltip_manager_; + // The root of the View hierarchy attached to this window. scoped_ptr<RootView> root_view_; - scoped_ptr<TooltipManagerGtk> tooltip_manager_; - // If true, the mouse is currently down. bool is_mouse_down_; diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h index 6ae1141..33c247e 100644 --- a/views/widget/widget_win.h +++ b/views/widget/widget_win.h @@ -516,10 +516,7 @@ class WidgetWin : public Widget, // The TooltipManager. // WARNING: RootView's destructor calls into the TooltipManager. As such, this - // must be destroyed AFTER root_view_. This really only matters during - // WM_SESSIONEND, as normally the hwnd is destroyed which tiggers unsetting - // the widget in the RootView so that RootView's destructor doesn't call into - // the TooltipManager. + // must be destroyed AFTER root_view_. scoped_ptr<TooltipManagerWin> tooltip_manager_; // The focus manager keeping track of focus for this Widget and any of its |