Initial implementation of ColorChooser for Aura.

chrome/browser/ui/views/color_chooser_win.cc

Index: chrome/browser/ui/views/color_chooser_win.cc
diff --git a/chrome/browser/ui/views/color_chooser_win.cc b/chrome/browser/ui/views/color_chooser_win.cc
index 16ceba7e5775798b5a6e6bc3c4a744673be050ec..f6fe9bf39ea8ed8222ba064143dbe57829c32f18 100644
--- a/chrome/browser/ui/views/color_chooser_win.cc
+++ b/chrome/browser/ui/views/color_chooser_win.cc
@@ -11,9 +11,10 @@
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "ui/views/color_chooser/color_chooser_listener.h"
 
 class ColorChooserWin : public content::ColorChooser,

[Peter Kasting, 2012/06/18 21:24:03]

Nit: Alphabetical order

[Jun Mukai, 2012/06/19 08:40:00]

Done.

-                        public ColorChooserDialog::Listener,
+                        public views::ColorChooserListener,
                         public content::WebContentsObserver {
  public:
   ColorChooserWin(int identifier,
@@ -21,13 +22,13 @@ class ColorChooserWin : public content::ColorChooser,
                   SkColor initial_color);
   ~ColorChooserWin();
 
-  // content::ColorChooser:
+  // content::ColorChooser overrides:
   virtual void End() OVERRIDE {}
   virtual void SetSelectedColor(SkColor color) OVERRIDE {}
 
-  // ColorChooserDialog::Listener:
-  virtual void DidChooseColor(SkColor color);
-  virtual void DidEnd();
+  // views::ColorChooserListener overrides:
+  virtual void OnColorChosen(SkColor color);
+  virtual void OnColorChooserDialogClosed();
 
  private:
   scoped_refptr<ColorChooserDialog> color_chooser_dialog_;
@@ -56,12 +57,12 @@ ColorChooserWin::~ColorChooserWin() {
   DCHECK(!color_chooser_dialog_);
 }
 
-void ColorChooserWin::DidChooseColor(SkColor color) {
+void ColorChooserWin::OnColorChosen(SkColor color) {
   if (web_contents())
     web_contents()->DidChooseColorInColorChooser(identifier(), color);
 }
 
-void ColorChooserWin::DidEnd() {
+void ColorChooserWin::OnColorChooserDialogClosed() {
   if (color_chooser_dialog_.get()) {
     color_chooser_dialog_->ListenerDestroyed();
     color_chooser_dialog_ = NULL;