Initial implementation of ColorChooser for Aura.

chrome/browser/ui/views/color_chooser_win.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 <windows.h>
 
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/views/color_chooser_dialog.h"
 #include "content/public/browser/color_chooser.h"
 #include "content/public/browser/render_view_host.h"
 #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,
-                        public ColorChooserDialog::Listener,
-                        public content::WebContentsObserver {
+                        public content::WebContentsObserver,

[Peter Kasting, 2012/06/19 21:10:31]

What is this base class used for?

[Jun Mukai, 2012/06/20 09:29:08]

I didn't introduce this and not so sure what was the original motivation. 
According to the code, I guess that's used only for the 'web_contents()' methods
which holds the "tab" in the constructor...

Removed and introduced tab_ field as _aura.cc does.

+                        public views::ColorChooserListener {
  public:
   ColorChooserWin(int identifier,
                   content::WebContents* tab,
                   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_;
 };
 
 content::ColorChooser* content::ColorChooser::Create(int identifier,
                                                      content::WebContents* tab,
                                                      SkColor initial_color) {
   return new ColorChooserWin(identifier, tab, initial_color);
 }
 
 ColorChooserWin::ColorChooserWin(int identifier,
                                  content::WebContents* tab,
                                  SkColor initial_color)
     : content::ColorChooser(identifier),
       content::WebContentsObserver(tab) {
   gfx::NativeWindow owning_window = platform_util::GetTopLevel(
       web_contents()->GetRenderViewHost()->GetView()->GetNativeView());
   color_chooser_dialog_ = new ColorChooserDialog(this,
                                                  initial_color,
                                                  owning_window);
 }
 
 ColorChooserWin::~ColorChooserWin() {
   // Always call End() before destroying.
   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;
   }
   if (web_contents())
     web_contents()->DidEndColorChooser(identifier());
 }