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

content/public/browser/color_chooser.h

Index: content/public/browser/color_chooser.h
diff --git a/content/public/browser/color_chooser.h b/content/public/browser/color_chooser.h
index 9b0bf40f22bb22fdd248180c1c0c1027dd59026f..f6b64006bab1288734587fd0809e488951051064 100644
--- a/content/public/browser/color_chooser.h
+++ b/content/public/browser/color_chooser.h
@@ -11,24 +11,13 @@ namespace content {
 
 class WebContents;
 
-// Abstraction object for color choosers for each platform.
+// Interface for a color chooser.
 class ColorChooser {
  public:
-  static ColorChooser* Create(int identifier,
-                              WebContents* web_contents,
-                              SkColor initial_color);
-
-  explicit ColorChooser(int identifier) : identifier_(identifier) {}
-  virtual ~ColorChooser() {}
-
-  // Returns a unique identifier for this chooser.  Identifiers are unique
-  // across a renderer process.  This avoids race conditions in synchronizing
-  // the browser and renderer processes.  For example, if a renderer closes one
-  // chooser and opens another, and simultaneously the user picks a color in the
-  // first chooser, the IDs can be used to drop the "chose a color" message
-  // rather than erroneously tell the renderer that the user picked a color in
-  // the second chooser.
-  int identifier() const { return identifier_; }
+  static ColorChooser* Open(content::WebContents* web_contents,

[Ben Goodger (Google), 2013/04/19 16:24:54]

you shouldn't put this method on content api. since you implement in chrome it
means you can't use content in another library without a link error. this method
should live in chrome.

[keishi, 2013/04/22 01:54:29]

I moved it to chrome/browser/ui/color_chooser_util.h

+                            SkColor initial_color);
+
+  virtual ~ColorChooser() {};
 
   // Ends connection with color chooser. Closes color chooser depending on the
   // platform.
@@ -36,9 +25,6 @@ class ColorChooser {
 
   // Sets the selected color.
   virtual void SetSelectedColor(SkColor color) = 0;
-
- private:
-  int identifier_;
 };
 
 }  // namespace content