diff options
Diffstat (limited to 'chrome/browser/ui')
-rw-r--r-- | chrome/browser/ui/cocoa/global_error_bubble_controller.h | 1 | ||||
-rw-r--r-- | chrome/browser/ui/cocoa/global_error_bubble_controller.mm | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.h b/chrome/browser/ui/cocoa/global_error_bubble_controller.h index 8061104..63e5605 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.h +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.h @@ -16,6 +16,7 @@ class GlobalError; // about a global error. @interface GlobalErrorBubbleController : BaseBubbleController { @private + // |error_| can be NULL after -close is called. GlobalError* error_; IBOutlet NSImageView* iconView_; diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index a1d5f77..1691e7e 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -86,7 +86,9 @@ const CGFloat kWrenchBubblePointOffsetY = 6; } - (void)close { - error_->BubbleViewDidClose(); + if (error_) + error_->BubbleViewDidClose(); + error_ = NULL; BrowserWindowController* bwc = [BrowserWindowController browserWindowControllerForWindow:[self parentWindow]]; [bwc releaseBarVisibilityForOwner:self withAnimation:YES delay:NO]; |