diff options
| author | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 19:21:42 +0000 |
|---|---|---|
| committer | jianli@chromium.org <jianli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-14 19:21:42 +0000 |
| commit | f14e35265ef1caec2f968138b1b64fb72600243a (patch) | |
| tree | bf7addb90ed4d5d08f766256ed2853a83cd9f75d | |
| parent | 7f278ee3525eccec016ec0616aee000b3b96d35e (diff) | |
| download | chromium_src-f14e35265ef1caec2f968138b1b64fb72600243a.zip chromium_src-f14e35265ef1caec2f968138b1b64fb72600243a.tar.gz chromium_src-f14e35265ef1caec2f968138b1b64fb72600243a.tar.bz2 | |
Ensure both PanelBrowserWindowGtk and BalloonCollectionImpl call RemoveObserver.
The fix is to ensure we do not miss calling MessageLoopForUI::RemoveObserver() in both destructors.
BUG=117278
TEST=Manual verify both destructors contain the call.
Review URL: http://codereview.chromium.org/9692070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126702 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/notifications/balloon_collection_impl.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/ui/panels/panel_browser_window_gtk.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/notifications/balloon_collection_impl.cc b/chrome/browser/notifications/balloon_collection_impl.cc index cfeeac6..01780c0 100644 --- a/chrome/browser/notifications/balloon_collection_impl.cc +++ b/chrome/browser/notifications/balloon_collection_impl.cc @@ -56,6 +56,9 @@ BalloonCollectionImpl::BalloonCollectionImpl() } BalloonCollectionImpl::~BalloonCollectionImpl() { +#if USE_OFFSETS + RemoveMessageLoopObserver(); +#endif } void BalloonCollectionImpl::AddImpl(const Notification& notification, diff --git a/chrome/browser/ui/panels/panel_browser_window_gtk.cc b/chrome/browser/ui/panels/panel_browser_window_gtk.cc index 151322a..c2b3c1c 100644 --- a/chrome/browser/ui/panels/panel_browser_window_gtk.cc +++ b/chrome/browser/ui/panels/panel_browser_window_gtk.cc @@ -69,6 +69,7 @@ PanelBrowserWindowGtk::PanelBrowserWindowGtk(Browser* browser, } PanelBrowserWindowGtk::~PanelBrowserWindowGtk() { + CleanupDragDrop(); } void PanelBrowserWindowGtk::Init() { |