diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 23:43:05 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-11 23:43:05 +0000 |
| commit | 64974cc0c9b92056aff7b9a4cdf5a2cd071f8108 (patch) | |
| tree | 2652aebeb668c2a8bac39459b1397e16cee83f87 /chrome | |
| parent | 6a61ee2989d4bcd8197d2ad00ae67aee29c30207 (diff) | |
| download | chromium_src-64974cc0c9b92056aff7b9a4cdf5a2cd071f8108.zip chromium_src-64974cc0c9b92056aff7b9a4cdf5a2cd071f8108.tar.gz chromium_src-64974cc0c9b92056aff7b9a4cdf5a2cd071f8108.tar.bz2 | |
Revert 41342 - Make bubble more tolerant of notification order when quitting.
BUG=http://crbug.com/37807
TEST=\
Run a debug build of Chrome like this:
NSZombieEnabled=YES xcodebuild/Debug/Chromium.app/Contents/MacOS/Chromium
Open a bubble then CmdQ.
Make sure you don't see a line like this:
20100310 19:24:20.381 Chromium[73024:903] *** [ChromeBrowserWindow removeChildWindow:]: message sent to deallocated instance 0x18f8b2a0
Repeat 20 times.
Review URL: http://codereview.chromium.org/839003
TBR=jrg@chromium.org
Review URL: http://codereview.chromium.org/902001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41350 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bubble_controller.mm | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.mm b/chrome/browser/cocoa/bookmark_bubble_controller.mm index a2e4737..be1fd30 100644 --- a/chrome/browser/cocoa/bookmark_bubble_controller.mm +++ b/chrome/browser/cocoa/bookmark_bubble_controller.mm @@ -123,15 +123,6 @@ - (void)close { [parentWindow_ removeChildWindow:[self window]]; - - // If you quit while the bubble is open, sometimes we get a - // DidResignKey before we get our parent's WindowWillClose and - // sometimes not. We protect against a multiple close (or reference - // to parentWindow_ at a bad time) by clearing it out once we're - // done, and by removing ourself from future notifications. - parentWindow_ = nil; - [[NSNotificationCenter defaultCenter] removeObserver:self]; - [super close]; } |