diff options
| author | keishi@chromium.org <keishi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-29 06:34:03 +0000 |
|---|---|---|
| committer | keishi@chromium.org <keishi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-29 06:34:03 +0000 |
| commit | 8bc5ff0ff41b61aad74cff67fdead70dd133a013 (patch) | |
| tree | 3576181deae0df9bdfd9e8badad749206795eb7b /apps | |
| parent | e675a40da82bf54681449d6b08efafd01d6a7671 (diff) | |
| download | chromium_src-8bc5ff0ff41b61aad74cff67fdead70dd133a013.zip chromium_src-8bc5ff0ff41b61aad74cff67fdead70dd133a013.tar.gz chromium_src-8bc5ff0ff41b61aad74cff67fdead70dd133a013.tar.bz2 | |
Add support for color input datalist on Android
We pass the list of suggestions when opening the color chooser.
We also pass the suggestion labels but we aren't using them yet. We should use them in the future to improve accessibility.
The suggestions are arranged in a grid with four columns.
BUG=242455
NOTRY=true
Review URL: https://codereview.chromium.org/23026006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237890 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/shell_window.cc | 6 | ||||
| -rw-r--r-- | apps/shell_window.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 75cd7cd..ada3c81 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -613,8 +613,10 @@ 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<content::ColorSuggestion>& suggestionss) { return delegate_->ShowColorChooser(web_contents, initial_color); } diff --git a/apps/shell_window.h b/apps/shell_window.h index e833f75..584c612 100644 --- a/apps/shell_window.h +++ b/apps/shell_window.h @@ -347,7 +347,9 @@ class ShellWindow : public content::NotificationObserver, virtual void CloseContents(content::WebContents* contents) OVERRIDE; virtual bool ShouldSuppressDialogs() OVERRIDE; virtual content::ColorChooser* OpenColorChooser( - content::WebContents* web_contents, SkColor color) OVERRIDE; + content::WebContents* web_contents, + SkColor color, + const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE; virtual void RunFileChooser( content::WebContents* tab, const content::FileChooserParams& params) OVERRIDE; |