Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1538)

Unified Diff: Source/web/ColorChooserUIController.cpp

Issue 23236002: Prepare for color input datalist support on Android (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/WebColorSuggestion.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/ColorChooserUIController.cpp
diff --git a/Source/web/ColorChooserUIController.cpp b/Source/web/ColorChooserUIController.cpp
index 7ea5e26cbd87adedec27ebfdb3199d1b38e04c03..f25a2d5f5c8d61b5c1b0df1010d24901f38acdd7 100644
--- a/Source/web/ColorChooserUIController.cpp
+++ b/Source/web/ColorChooserUIController.cpp
@@ -28,6 +28,9 @@
#include "ChromeClientImpl.h"
#include "WebColorChooser.h"
+#include "WebColorSuggestion.h"
+#include "WebViewClient.h"
+#include "WebViewImpl.h"
#include "platform/ColorChooserClient.h"
#include "platform/graphics/Color.h"
#include "public/platform/WebColor.h"
@@ -80,7 +83,10 @@ void ColorChooserUIController::didEndChooser()
void ColorChooserUIController::openColorChooser()
{
ASSERT(!m_chooser);
- m_chooser = m_chromeClient->createWebColorChooser(this, static_cast<WebColor>(m_client->currentColor().rgb()));
+ 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())));
}
} // namespace blink
« no previous file with comments | « Source/web/ColorChooserPopupUIController.cpp ('k') | Source/web/WebColorSuggestion.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698