diff options
| author | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:59:20 +0000 |
|---|---|---|
| committer | andybons@chromium.org <andybons@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-02 20:59:20 +0000 |
| commit | fac15c494ac3cacfcd905e8bc186ef212ad943e3 (patch) | |
| tree | 5d24e981bb9aec910946a1499e14a33b493502f3 /chrome/browser/cocoa/info_bubble_window.mm | |
| parent | 8471424148c07642dee2796673feb2d66be75074 (diff) | |
| download | chromium_src-fac15c494ac3cacfcd905e8bc186ef212ad943e3.zip chromium_src-fac15c494ac3cacfcd905e8bc186ef212ad943e3.tar.gz chromium_src-fac15c494ac3cacfcd905e8bc186ef212ad943e3.tar.bz2 | |
[Mac] Make the extension popup a singleton instance to avoid maintaining multiple pointer references to a class that, by design, can only have one popup open at a time.
The bug fixed in this change has to do with PageActionView having a dirty pointer to a popup if it was closed via losing its key state. Once a notification like EXTENSION_HOST_VIEW_SHOULD_CLOSE was fired, then the PageActionView would assume the pointer was valid and call on dirty memory.
TEST=none
BUG=29492,33590
Review URL: http://codereview.chromium.org/561013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37873 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa/info_bubble_window.mm')
| -rw-r--r-- | chrome/browser/cocoa/info_bubble_window.mm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/cocoa/info_bubble_window.mm b/chrome/browser/cocoa/info_bubble_window.mm index 84ad0b4..80c0b8d 100644 --- a/chrome/browser/cocoa/info_bubble_window.mm +++ b/chrome/browser/cocoa/info_bubble_window.mm @@ -115,9 +115,8 @@ const NSTimeInterval kOrderOutAnimationDuration = 0.15; // Called by InfoBubbleWindowCloser when the window is to be really closed // after the fading animation is complete. - (void)finishCloseAfterAnimation { - if (closing_) { + if (closing_) [super close]; - } } // Adds animation for info bubbles being ordered to the front. @@ -151,9 +150,8 @@ const NSTimeInterval kOrderOutAnimationDuration = 0.15; // If the window is currently animating a close, block all UI events to the // window. - (void)sendEvent:(NSEvent*)theEvent { - if (!closing_) { + if (!closing_) [super sendEvent:theEvent]; - } } - (BOOL)isClosing { |