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

components/web_contents_delegate_android/color_chooser_android.h

Index: components/web_contents_delegate_android/color_chooser_android.h
diff --git a/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
index 7b9cc1ac8231385f3961608c8e048ff1391710aa..3c98406e12692f9a3ec03553ae20508a9f8f69df 100644
--- a/components/web_contents_delegate_android/color_chooser_android.h
+++ b/components/web_contents_delegate_android/color_chooser_android.h
@@ -9,7 +9,6 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "content/public/browser/color_chooser.h"
-#include "content/public/browser/web_contents_observer.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ScopedJavaLocalRef;
@@ -17,10 +16,9 @@ using base::android::ScopedJavaLocalRef;
 namespace components {
 
 // Glues the Java (ColorPickerChooser.java) picker with the native part.
-class ColorChooserAndroid : public content::ColorChooser,
-                            public content::WebContentsObserver {
+class ColorChooserAndroid : public content::ColorChooser {
  public:
-  ColorChooserAndroid(int identifier, content::WebContents* tab,
+  ColorChooserAndroid(content::WebContents* tab,
                       SkColor initial_color);
   virtual ~ColorChooserAndroid();
 
@@ -33,6 +31,10 @@ class ColorChooserAndroid : public content::ColorChooser,
  private:
   base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;
 
+  // The web contents invoking the color chooser.  No ownership. because it will
+  // outlive this class.
+  content::WebContents* web_contents;

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

web_contents_

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

Done.

+
   DISALLOW_COPY_AND_ASSIGN(ColorChooserAndroid);
 };