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

chrome/browser/ui/views/color_chooser_dialog.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/color_chooser_dialog.h"
 
 #include <commdlg.h>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 50 matching lines @@
   bool success = !!ChooseColor(&cc);
   DisableOwner(cc.hwndOwner);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       base::Bind(&ColorChooserDialog::DidCloseDialog, this, success,
                  skia::COLORREFToSkColor(cc.rgbResult), params.run_state));
 }
 
 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) {
   memcpy(dst, src, sizeof(COLORREF) * arraysize(g_custom_colors));
 }