Merge 220639 "ColorChooserWin::End should act like the dialog ha..."

chrome/browser/ui/views/color_chooser_dialog.cc

Index: chrome/browser/ui/views/color_chooser_dialog.cc
===================================================================
--- chrome/browser/ui/views/color_chooser_dialog.cc	(revision 222975)
+++ chrome/browser/ui/views/color_chooser_dialog.cc	(working copy)
@@ -68,13 +68,13 @@
 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) {