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

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

Issue 10442020: Initial implementation of ColorChooser for Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 6 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 | « chrome/browser/ui/views/color_chooser_dialog.h ('k') | 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 1a3c129aab4490a8ffdd88125a9b653a071bcb44..0133e8e5f1c10825627009eb0d054d0928e4a38d 100644
--- a/chrome/browser/ui/views/color_chooser_dialog.cc
+++ b/chrome/browser/ui/views/color_chooser_dialog.cc
@@ -11,6 +11,7 @@
#include "base/threading/thread.h"
#include "content/public/browser/browser_thread.h"
#include "skia/ext/skia_utils_win.h"
+#include "ui/views/color_chooser/color_chooser_listener.h"
using content::BrowserThread;
@@ -25,7 +26,7 @@ ColorChooserDialog::ExecuteOpenParams::ExecuteOpenParams(SkColor color,
owner(owner) {
}
-ColorChooserDialog::ColorChooserDialog(Listener* listener,
+ColorChooserDialog::ColorChooserDialog(views::ColorChooserListener* listener,
SkColor initial_color,
gfx::NativeWindow owning_window)
: listener_(listener) {
@@ -72,8 +73,8 @@ void ColorChooserDialog::DidCloseDialog(bool chose_color,
EndRun(run_state);
CopyCustomColors(custom_colors_, g_custom_colors);
if (chose_color)
- listener_->DidChooseColor(color);
- listener_->DidEnd();
+ listener_->OnColorChosen(color);
+ listener_->OnColorChooserDialogClosed();
}
void ColorChooserDialog::CopyCustomColors(COLORREF* src, COLORREF* dst) {
« no previous file with comments | « chrome/browser/ui/views/color_chooser_dialog.h ('k') | chrome/browser/ui/views/color_chooser_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698