commit a854de003a23bf3c7f95ec0f8154ada64092ff5c
author Torne (Richard Coles) <torne@google.com> Wed Dec 18 16:25:25 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Wed Dec 18 16:25:25 2013 +0000
tree b96f605a5928ea57c1ed83680b29485d63714c3d
parent 9af47914d11f72f9f18719c3ab4ffdf757aa8bf6

Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: Idca0efe87ed6b721349fbeab55bfdc919cc4941d

Source/web/ColorChooserUIController.cpp

diff --git a/Source/web/ColorChooserUIController.cpp b/Source/web/ColorChooserUIController.cpp
index f25a2d5..3bb1742 100644
--- a/Source/web/ColorChooserUIController.cpp
+++ b/Source/web/ColorChooserUIController.cpp
@@ -86,7 +86,8 @@
     WebViewClient* webViewClient = static_cast<WebViewImpl*>(m_chromeClient->webView())->client();
     if (!webViewClient)
         return;
-    m_chooser = adoptPtr(webViewClient->createColorChooser(this, static_cast<WebColor>(m_client->currentColor().rgb())));
+    m_chooser = adoptPtr(webViewClient->createColorChooser(
+        this, static_cast<WebColor>(m_client->currentColor().rgb()), m_client->suggestions()));
 }
 
 } // namespace blink