Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5833)

Unified Diff: chrome/browser/ui/views/color_chooser_dialog.cc

Issue 23785003: ColorChooserWin::End should act like the dialog has closed (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changed comment again. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/views/color_chooser_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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) {
« no previous file with comments | « no previous file | chrome/browser/ui/views/color_chooser_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698