| Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm
|
| diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm
|
| index 00aff4d4c656d25a56024ad53c8d965d4f8cfa4c..edf9ad06f8ad3c6b4f5b4955406c9128e73e105b 100644
|
| --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm
|
| +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm
|
| @@ -93,7 +93,9 @@ MediaGalleriesDialogCocoa::MediaGalleriesDialogCocoa(
|
| controller_->HasPermittedGalleries()];
|
|
|
| set_sheet(alert_);
|
| - window_ = new ConstrainedWindowMac(controller->tab_contents(), this);
|
| + // May be NULL during tests.
|
| + if (controller->tab_contents())
|
| + window_ = new ConstrainedWindowMac(controller->tab_contents(), this);
|
| }
|
|
|
| MediaGalleriesDialogCocoa::~MediaGalleriesDialogCocoa() {
|
| @@ -124,10 +126,12 @@ void MediaGalleriesDialogCocoa::SheetDidEnd(NSInteger result) {
|
| switch (result) {
|
| case NSAlertFirstButtonReturn:
|
| accepted_ = true;
|
| - window_->CloseConstrainedWindow();
|
| + if (window_)
|
| + window_->CloseConstrainedWindow();
|
| break;
|
| case NSAlertSecondButtonReturn:
|
| - window_->CloseConstrainedWindow();
|
| + if (window_)
|
| + window_->CloseConstrainedWindow();
|
| break;
|
| default:
|
| NOTREACHED();
|
|
|