summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 13:15:18 +0000
committertonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-28 13:15:18 +0000
commitcaf38ede8257f27ad8beacf030fdd5f52fb4fc8d (patch)
treefd5afec09d4eb7e70c93a6576d17826dc0105d7e /ui
parent433902586dfdde42550da6f7421708361220df8e (diff)
downloadchromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.zip
chromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.tar.gz
chromium_src-caf38ede8257f27ad8beacf030fdd5f52fb4fc8d.tar.bz2
Roll WebKit 91883:91912.
Also add new enum values corresponding to: http://trac.webkit.org/changeset/91892. Keeping the enums in sync prevents several chromium tests from DCHECK()ing. TBR=enne@chromium.org,penghuang@chromium.org BUG=None TEST=None Review URL: http://codereview.chromium.org/7523028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94453 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/base/ime/text_input_type.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/ui/base/ime/text_input_type.h b/ui/base/ime/text_input_type.h
index 19c1332..c5ba3bb 100644
--- a/ui/base/ime/text_input_type.h
+++ b/ui/base/ime/text_input_type.h
@@ -21,8 +21,11 @@ enum TextInputType {
// it's suitable for password input.
TEXT_INPUT_TYPE_PASSWORD,
- // TODO(suzhe): Add more text input types when necessary, eg. Number, Date,
- // Email, URL, etc.
+ TEXT_INPUT_TYPE_SEARCH,
+ TEXT_INPUT_TYPE_EMAIL,
+ TEXT_INPUT_TYPE_NUMBER,
+ TEXT_INPUT_TYPE_TELEPHONE,
+ TEXT_INPUT_TYPE_URL,
};
} // namespace ui