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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: apps/shell_window.cc

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 months 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
« apps/shell_window.h ('K') | « apps/shell_window.h ('k') | chrome/browser/devtools/devtools_window.h » ('j') | components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell_window.cc
diff --git a/apps/shell_window.cc b/apps/shell_window.cc
index 12585aad5d534ce346ed3e1f82b9dd5545878899..90d643bb75d423077f28be4b6a24b36425b659b1 100644
--- a/apps/shell_window.cc
+++ b/apps/shell_window.cc
@@ -454,8 +454,11 @@ bool ShellWindow::ShouldSuppressDialogs() {
return true;
}
-content::ColorChooser* ShellWindow::OpenColorChooser(WebContents* web_contents,
- SkColor initial_color) {
+content::ColorChooser* ShellWindow::OpenColorChooser(
+ WebContents* web_contents,
+ SkColor initial_color,
+ const std::vector<SkColor>& suggestions,
+ const std::vector<string16>& suggestion_labels) {
return delegate_->ShowColorChooser(web_contents, initial_color);
}
« apps/shell_window.h ('K') | « apps/shell_window.h ('k') | chrome/browser/devtools/devtools_window.h » ('j') | components/web_contents_delegate_android/android/java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698