| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 01cb2bcc0b8b7a0153100818c456cd04afde8a79..b79051780373af0d234477dad84bb41570426073 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2532,10 +2532,15 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() {
|
|
|
| WebKit::WebColorChooser* RenderViewImpl::createColorChooser(
|
| WebKit::WebColorChooserClient* client,
|
| - const WebKit::WebColor& initial_color) {
|
| + const WebKit::WebColor& initial_color,
|
| + const WebKit::WebVector<WebKit::WebColorSuggestion>& suggestions) {
|
| RendererWebColorChooserImpl* color_chooser =
|
| new RendererWebColorChooserImpl(this, client);
|
| - color_chooser->Open(static_cast<SkColor>(initial_color));
|
| + std::vector<content::ColorSuggestion> color_suggestions;
|
| + for (size_t i = 0; i < suggestions.size(); i++) {
|
| + color_suggestions.push_back(content::ColorSuggestion(suggestions[i]));
|
| + }
|
| + color_chooser->Open(static_cast<SkColor>(initial_color), color_suggestions);
|
| return color_chooser;
|
| }
|
|
|
|
|