Index: ui/keyboard/keyboard_resources.grd |
diff --git a/ui/keyboard/keyboard_resources.grd b/ui/keyboard/keyboard_resources.grd |
index e437051f1699d2ea6b368793336b5c1a1c1b1402..26bad75b72ef30b3517525f8503612b01a84ca72 100644 |
--- a/ui/keyboard/keyboard_resources.grd |
+++ b/ui/keyboard/keyboard_resources.grd |
@@ -15,22 +15,25 @@ |
<release seq="1"> |
<includes> |
<include name="IDR_KEYBOARD_API_ADAPTER_JS" file="resources/api_adapter.js" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_COMMON_JS" file="resources/common.js" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_CHEVRON" file="resources/images/chevron.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_DEL" file="resources/images/del.svg" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_CONSTANTS_JS" file="resources/constants.js" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_ELEMENTS_KEY" file="resources/elements/kb-key.html" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_ELEMENTS_KEYBOARD" file="resources/elements/kb-keyboard.html" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_ELEMENTS_KEYSET" file="resources/elements/kb-keyset.html" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_ELEMENTS_ROW" file="resources/elements/kb-row.html" type="BINDATA" /> |
<include name="IDR_KEYBOARD_IMAGES_KEYBOARD" file="resources/images/keyboard.svg" type="BINDATA" /> |
<include name="IDR_KEYBOARD_IMAGES_MIC" file="resources/images/mic.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_RET" file="resources/images/ret.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_SHIFT" file="resources/images/shift.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_SHIFT_DOWN" file="resources/images/shift-down.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_IMAGES_TAB" file="resources/images/tab.svg" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_INDEX" file="resources/index.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_LAYOUT_US_JS" file="resources/layout_us.js" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_MAIN_CSS" file="resources/main.css" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_IMAGES_MIC_GREEN" file="resources/images/mic-green.svg" type="BINDATA" /> |
+ <!-- Don't flatten html file here. Otherwise, webui keyboard will not load the correct css file. --> |
+ <include name="IDR_KEYBOARD_INDEX" file="resources/index.html" allowexternalscript="true" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_KEYSETS" file="resources/keysets.html" type="BINDATA" /> |
<include name="IDR_KEYBOARD_MAIN_JS" file="resources/main.js" type="BINDATA" /> |
<include name="IDR_KEYBOARD_MANIFEST" file="resources/manifest.json" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_MAIN_CSS" file="resources/main.css" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_POLYMER" file="resources/polymer.min.js" flattenhtml="true" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_VOICE_INPUT_JS" file="resources/voice_input.js" type="BINDATA" /> |
<include name="IDR_KEYBOARD_WEBUI_API_ADAPTER_JS" file="resources/webui/api_adapter.js" type="BINDATA" /> |
- <include name="IDR_KEYBOARD_WEBUI_LAYOUT_US_JS" file="resources/webui/layout_us.js" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_WEBUI_CONSTANTS_JS" file="resources/webui/constants.js" type="BINDATA" /> |
+ <include name="IDR_KEYBOARD_WEBUI_KEYSETS" file="resources/webui/keysets.html" type="BINDATA" /> |
<include name="IDR_KEYBOARD_WEBUI_MAIN_CSS" file="resources/webui/main.css" type="BINDATA" /> |
</includes> |
</release> |