Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(837)

Unified Diff: components/web_contents_delegate_android/web_contents_delegate_android.cc

Issue 13150004: Support color chooser inside extesions, apps, chrome frame, dev tool (Closed) Base URL: http://git.chromium.org/chromium/src.git@ngcolor
Patch Set: Removed chrome/browser/ui/color_chooser.cc Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/web_contents_delegate_android/web_contents_delegate_android.cc
diff --git a/components/web_contents_delegate_android/web_contents_delegate_android.cc b/components/web_contents_delegate_android/web_contents_delegate_android.cc
index 1e09f2f0b431aa86ecf1e4dc266d207887e30c4d..f78c8eb9bd2aadcb959552e0fe273da539e4b823 100644
--- a/components/web_contents_delegate_android/web_contents_delegate_android.cc
+++ b/components/web_contents_delegate_android/web_contents_delegate_android.cc
@@ -8,6 +8,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
+#include "components/web_contents_delegate_android/color_chooser_android.h"
#include "content/public/browser/android/content_view_core.h"
#include "content/public/browser/color_chooser.h"
#include "content/public/browser/invalidate_type.h"
@@ -49,11 +50,9 @@ WebContentsDelegateAndroid::GetJavaDelegate(JNIEnv* env) const {
// WebContentsDelegate methods
// ----------------------------------------------------------------------------
-ColorChooser* WebContentsDelegateAndroid::OpenColorChooser(
- WebContents* source,
- int color_chooser_id,
- SkColor color) {
- return ColorChooser::Create(color_chooser_id, source, color);
+ColorChooser* WebContentsDelegateAndroid::OpenColorChooser(WebContents* source,
+ SkColor color) {
+ return new ColorChooserAndroid(source, color);
}
// OpenURLFromTab() will be called when we're performing a browser-intiated

Powered by Google App Engine
This is Rietveld 408576698