Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 3a2abf6a951c9c7ebd9431b0e20d55e8a4aba236..bf9ab697fe5d6f183a86561772ea2528d8a972ea 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -2650,12 +2650,17 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() { |
return did_execute_command; |
} |
-blink::WebColorChooser* RenderViewImpl::createColorChooser( |
+WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
blink::WebColorChooserClient* client, |
- const blink::WebColor& initial_color) { |
+ const blink::WebColor& initial_color, |
+ const blink::WebVector<blink::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; |
} |