Support color chooser inside extesions, apps, chrome frame, dev tool

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 5c03f1177e0bf807c860fe3160dacc0500ee7964..f49a06d32bf87b9b823073ff86079733bb15f31f 100644
--- a/chrome/browser/ui/views/color_chooser_win.cc
+++ b/chrome/browser/ui/views/color_chooser_win.cc
@@ -10,14 +10,15 @@
 #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 views::ColorChooserListener {
  public:
-  ColorChooserWin(int identifier,
-                  content::WebContents* tab,
+  static ColorChooserWin* Open(content::WebContents* web_contents,
+                               SkColor initial_color);
+
+  ColorChooserWin(content::WebContents* web_contents,
                   SkColor initial_color);
   ~ColorChooserWin();
 
@@ -30,27 +31,35 @@ class ColorChooserWin : public content::ColorChooser,
   virtual void OnColorChooserDialogClosed();
 
  private:
+  static ColorChooserWin* current_color_chooser_;
+
   // The web contents invoking the color chooser.  No ownership. because it will
   // outlive this class.
-  content::WebContents* tab_;
+  content::WebContents* web_contents_;
 
   // The color chooser dialog which maintains the native color chooser UI.
   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::current_color_chooser_ = NULL;
+
+content::ColorChooser* content::ColorChooser::Open(
+    content::WebContents* web_contents, SkColor initial_color) {
+  return ColorChooserWin::Open(web_contents, initial_color);
+}
+
+ColorChooserWin* ColorChooserWin::Open(content::WebContents* web_contents,
+                                       SkColor initial_color) {
+  if (current_color_chooser_)
+    return current_color_chooser_;
+  return new ColorChooserWin(web_contents, initial_color);
 }
 
-ColorChooserWin::ColorChooserWin(int identifier,
-                                 content::WebContents* tab,
+ColorChooserWin::ColorChooserWin(content::WebContents* web_contents,
                                  SkColor initial_color)
-    : content::ColorChooser(identifier),
-      tab_(tab) {
+    : web_contents_(web_contents) {
   gfx::NativeWindow owning_window = platform_util::GetTopLevel(
-      tab_->GetRenderViewHost()->GetView()->GetNativeView());
+      web_contents->GetRenderViewHost()->GetView()->GetNativeView());
   color_chooser_dialog_ = new ColorChooserDialog(this,
                                                  initial_color,
                                                  owning_window);
@@ -62,8 +71,8 @@ ColorChooserWin::~ColorChooserWin() {
 }
 
 void ColorChooserWin::OnColorChosen(SkColor color) {
-  if (tab_)
-    tab_->DidChooseColorInColorChooser(identifier(), color);
+  if (web_contents_)
+    web_contents_->DidChooseColorInColorChooser(color);
 }
 
 void ColorChooserWin::OnColorChooserDialogClosed() {
@@ -71,6 +80,8 @@ void ColorChooserWin::OnColorChooserDialogClosed() {
     color_chooser_dialog_->ListenerDestroyed();
     color_chooser_dialog_ = NULL;
   }
-  if (tab_)
-    tab_->DidEndColorChooser(identifier());
+  DCHECK(current_color_chooser_ == this);
+  current_color_chooser_ = NULL;
+  if (web_contents_)
+    web_contents_->DidEndColorChooser();
 }