| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 6b3ca9f94632320567558f8e753ca78850a35652..4d3343a31ecd12a4bee64e191203c6aeb88fe16c 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -2540,10 +2540,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;
|
| }
|
|
|
|
|