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..f64a477c354bb4c098a1173aaf68bae00d05edb7 100644 |
--- a/chrome/browser/ui/views/color_chooser_win.cc |
+++ b/chrome/browser/ui/views/color_chooser_win.cc |
@@ -11,23 +11,24 @@ |
#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 t
|
+ 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_; |
@@ -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; |