diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 06:43:30 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-25 06:43:30 +0000 |
| commit | 710797ebdeff00731089e20ba70e20f86104df1a (patch) | |
| tree | c88787087dfb7ce63df7fdf1f7e9d7a2e3a5fe76 /ui/keyboard/keyboard_util.cc | |
| parent | f7438e0d4acc7644c6298fdd6e22fa72ff468bb9 (diff) | |
| download | chromium_src-710797ebdeff00731089e20ba70e20f86104df1a.zip chromium_src-710797ebdeff00731089e20ba70e20f86104df1a.tar.gz chromium_src-710797ebdeff00731089e20ba70e20f86104df1a.tar.bz2 | |
Consolidate handling of long-press keys on the virtual keyboard. Dynamically constructs the popup list of alternate key candidates. Decouples keyboard layout from suggested candidates on long-press so that a common set of accents to be used across multiple keyboard layouts, or alternative accents could be used for a single keyboard depending on language.
R=bryeung@chromium.org, bshe@chromium.org
Review URL: https://codereview.chromium.org/19860005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@213600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/keyboard/keyboard_util.cc')
| -rw-r--r-- | ui/keyboard/keyboard_util.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc index b0371d7..076eacf 100644 --- a/ui/keyboard/keyboard_util.cc +++ b/ui/keyboard/keyboard_util.cc @@ -71,10 +71,12 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { static const GritResourceMap kKeyboardResources[] = { {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS}, {"keyboard/constants.js", IDR_KEYBOARD_CONSTANTS_JS}, - {"keyboard/elements/kb-accent-container.html", - IDR_KEYBOARD_ELEMENTS_ACCENT_CONTAINER}, - {"keyboard/elements/kb-accent-key.html", IDR_KEYBOARD_ELEMENTS_ACCENT_KEY}, - {"keyboard/elements/kb-accent-set.html", IDR_KEYBOARD_ELEMENTS_ACCENT_SET}, + {"keyboard/elements/kb-altkey.html", IDR_KEYBOARD_ELEMENTS_ALTKEY}, + {"keyboard/elements/kb-altkey-container.html", + IDR_KEYBOARD_ELEMENTS_ALTKEY_CONTAINER}, + {"keyboard/elements/kb-altkey-data.html", + IDR_KEYBOARD_ELEMENTS_ALTKEY_DATA}, + {"keyboard/elements/kb-altkey-set.html", IDR_KEYBOARD_ELEMENTS_ALTKEY_SET}, {"keyboard/elements/kb-key.html", IDR_KEYBOARD_ELEMENTS_KEY}, {"keyboard/elements/kb-key-base.html", IDR_KEYBOARD_ELEMENTS_KEY_BASE}, {"keyboard/elements/kb-key-import.html", @@ -90,7 +92,10 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { IDR_KEYBOARD_IMAGES_MICROPHONE_GREEN}, {"keyboard/index.html", IDR_KEYBOARD_INDEX}, {"keyboard/layouts/dvorak.html", IDR_KEYBOARD_LAYOUTS_DVORAK}, + {"keyboard/layouts/latin-accents.js", IDR_KEYBOARD_LAYOUTS_LATIN_ACCENTS}, {"keyboard/layouts/qwerty.html", IDR_KEYBOARD_LAYOUTS_QWERTY}, + {"keyboard/layouts/symbol-altkeys.js", + IDR_KEYBOARD_LAYOUTS_SYMBOL_ALTKEYS}, {"keyboard/layouts/spacebar-row.html", IDR_KEYBOARD_SPACEBAR_ROW}, {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, |