Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index 0117924ed9d8796b3dd9bad31e37c1e490dc4daf..da2ed6514b960a8afa0f26d777bc17faaa06505c 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -2530,10 +2530,20 @@ bool RenderViewImpl::handleCurrentKeyboardEvent() { |
WebKit::WebColorChooser* RenderViewImpl::createColorChooser( |
WebKit::WebColorChooserClient* client, |
- const WebKit::WebColor& initial_color) { |
+ const WebKit::WebColor& initial_color, |
+ const WebKit::WebVector<WebKit::WebColor>& suggestions, |
+ const WebKit::WebVector<WebKit::WebString>& suggestionLabels) { |
Miguel Garcia
2013/08/19 14:43:27
suggestion_labels
|
RendererWebColorChooserImpl* color_chooser = |
new RendererWebColorChooserImpl(this, client); |
- color_chooser->Open(static_cast<SkColor>(initial_color)); |
+ std::vector<SkColor> suggestionColors; |
newt (away)
2013/08/19 23:18:19
be consistent with variable naming. You could use
keishi
2013/08/26 05:28:54
Done.
|
+ std::vector<string16> suggestion_label_strings; |
+ for (size_t i = 0; i < suggestions.size(); i++) { |
+ suggestionColors.push_back(static_cast<SkColor>(suggestions[i])); |
+ suggestion_label_strings.push_back(suggestionLabels[i]); |
+ } |
+ color_chooser->Open(static_cast<SkColor>(initial_color), |
+ suggestionColors, |
Miguel Garcia
2013/08/19 14:43:27
suggestion_colors
|
+ suggestion_label_strings); |
return color_chooser; |
} |