diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 16:32:33 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 16:32:33 +0000 |
| commit | 575ca202312dd7df1dd08f5df2fc55afd1e2ddb8 (patch) | |
| tree | 4dfe4e4818d8d4ea8285f82d4dbb136910ed23e4 /chrome/browser/extensions/image_loader.cc | |
| parent | 59661e5adb337208e2a142ab043f819d419b592e (diff) | |
| download | chromium_src-575ca202312dd7df1dd08f5df2fc55afd1e2ddb8.zip chromium_src-575ca202312dd7df1dd08f5df2fc55afd1e2ddb8.tar.gz chromium_src-575ca202312dd7df1dd08f5df2fc55afd1e2ddb8.tar.bz2 | |
Web Component Virtual Keyboard
Convert existing keyboard to web component keyboard. Also fix touch down state of keys.
BUG=242539, 240346
R=bryeung@chromium.org, miket@chromium.org, stevet@chromium.org
Review URL: https://codereview.chromium.org/15176004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/image_loader.cc')
| -rw-r--r-- | chrome/browser/extensions/image_loader.cc | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chrome/browser/extensions/image_loader.cc b/chrome/browser/extensions/image_loader.cc index a941e23..9586528 100644 --- a/chrome/browser/extensions/image_loader.cc +++ b/chrome/browser/extensions/image_loader.cc @@ -174,19 +174,20 @@ bool ImageLoader::IsComponentExtensionResource( #endif #if defined(USE_AURA) {"keyboard/api_adapter.js", IDR_KEYBOARD_API_ADAPTER_JS}, - {"keyboard/common.js", IDR_KEYBOARD_COMMON_JS}, - {"keyboard/images/chevron.svg", IDR_KEYBOARD_IMAGES_CHEVRON}, - {"keyboard/images/del.svg", IDR_KEYBOARD_IMAGES_DEL}, + {"keyboard/constants.js", IDR_KEYBOARD_CONSTANTS_JS}, + {"keyboard/elements/kb-key.html", IDR_KEYBOARD_ELEMENTS_KEY}, + {"keyboard/elements/kb-keyboard.html", IDR_KEYBOARD_ELEMENTS_KEYBOARD}, + {"keyboard/elements/kb-keyset.html", IDR_KEYBOARD_ELEMENTS_KEYSET}, + {"keyboard/elements/kb-row.html", IDR_KEYBOARD_ELEMENTS_ROW}, {"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, {"keyboard/images/mic.svg", IDR_KEYBOARD_IMAGES_MIC}, - {"keyboard/images/ret.svg", IDR_KEYBOARD_IMAGES_RET}, - {"keyboard/images/shift.svg", IDR_KEYBOARD_IMAGES_SHIFT}, - {"keyboard/images/shift_down.svg", IDR_KEYBOARD_IMAGES_SHIFT_DOWN}, - {"keyboard/images/tab.svg", IDR_KEYBOARD_IMAGES_TAB}, + {"keyboard/images/mic-green.svg", IDR_KEYBOARD_IMAGES_MIC_GREEN}, {"keyboard/index.html", IDR_KEYBOARD_INDEX}, - {"keyboard/layout_us.js", IDR_KEYBOARD_LAYOUT_US_JS}, + {"keyboard/keysets.html", IDR_KEYBOARD_KEYSETS}, {"keyboard/main.css", IDR_KEYBOARD_MAIN_CSS}, {"keyboard/main.js", IDR_KEYBOARD_MAIN_JS}, + {"keyboard/polymer.min.js", IDR_KEYBOARD_POLYMER}, + {"keyboard/voice_input.js", IDR_KEYBOARD_VOICE_INPUT_JS}, #endif }; static const size_t kExtraComponentExtensionResourcesSize = |