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

Unified Diff: Source/web/ChromeClientImpl.cpp

Issue 23236002: Prepare for color input datalist support on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Added labels Created 7 years, 4 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: Source/web/ChromeClientImpl.cpp
diff --git a/Source/web/ChromeClientImpl.cpp b/Source/web/ChromeClientImpl.cpp
index d2509cb753d7578f28b878508367ea087ae96337..7f9a042d01ec0e85281c163c0b44092ce54cd99a 100644
--- a/Source/web/ChromeClientImpl.cpp
+++ b/Source/web/ChromeClientImpl.cpp
@@ -616,12 +616,16 @@ PassOwnPtr<ColorChooser> ChromeClientImpl::createColorChooser(ColorChooserClient
controller->openUI();
return controller.release();
}
-PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor)
+PassOwnPtr<WebColorChooser> ChromeClientImpl::createWebColorChooser(WebColorChooserClient* chooserClient, const WebColor& initialColor, const Vector<Color>& suggestions, const Vector<String>& suggestionLabels)
{
WebViewClient* client = m_webView->client();
if (!client)
return nullptr;
- return adoptPtr(client->createColorChooser(chooserClient, initialColor));
+ Vector<WebColor> suggestionColors(suggestions.size());
+ for (size_t i = 0; i < suggestions.size(); ++i) {
+ suggestionColors[i] = static_cast<WebColor>(suggestions[i].rgb());
+ }
+ return adoptPtr(client->createColorChooser(chooserClient, initialColor, suggestionColors, suggestionLabels));
}
PassRefPtr<DateTimeChooser> ChromeClientImpl::openDateTimeChooser(DateTimeChooserClient* pickerClient, const DateTimeChooserParameters& parameters)

Powered by Google App Engine
This is Rietveld 408576698