Index: chrome/browser/ui/views/color_chooser_dialog.cc |
diff --git a/chrome/browser/ui/views/color_chooser_dialog.cc b/chrome/browser/ui/views/color_chooser_dialog.cc |
index fcd65c4b8ad21d59dbc4b97e3019b11c208d5614..97e542fed65b53e7e117de1120c93850502619b9 100644 |
--- a/chrome/browser/ui/views/color_chooser_dialog.cc |
+++ b/chrome/browser/ui/views/color_chooser_dialog.cc |
@@ -68,13 +68,13 @@ void ColorChooserDialog::ExecuteOpen(const ExecuteOpenParams& params) { |
void ColorChooserDialog::DidCloseDialog(bool chose_color, |
SkColor color, |
RunState run_state) { |
- if (!listener_) |
- return; |
EndRun(run_state); |
CopyCustomColors(custom_colors_, g_custom_colors); |
- if (chose_color) |
- listener_->OnColorChosen(color); |
- listener_->OnColorChooserDialogClosed(); |
+ if (listener_) { |
+ if (chose_color) |
+ listener_->OnColorChosen(color); |
+ listener_->OnColorChooserDialogClosed(); |
+ } |
} |
void ColorChooserDialog::CopyCustomColors(COLORREF* src, COLORREF* dst) { |