Commit 97267fe2 authored by rsadam's avatar rsadam Committed by Commit bot

Fixes grit not pulling in material design files.

BUG=470229

Review URL: https://codereview.chromium.org/1033773002

Cr-Commit-Position: refs/heads/master@{#322089}
parent 625a0c7d
...@@ -86,6 +86,12 @@ ...@@ -86,6 +86,12 @@
'src/chrome/os/inputview/inputtoolcode.js', 'src/chrome/os/inputview/inputtoolcode.js',
'src/chrome/os/inputview/keyboardcontainer.js', 'src/chrome/os/inputview/keyboardcontainer.js',
'src/chrome/os/inputview/layouts/compactspacerow.js', 'src/chrome/os/inputview/layouts/compactspacerow.js',
'src/chrome/os/inputview/layouts/material/compactspacerow.js',
'src/chrome/os/inputview/layouts/material/rowsof101.js',
'src/chrome/os/inputview/layouts/material/rowsof102.js',
'src/chrome/os/inputview/layouts/material/rowsofcompact.js',
'src/chrome/os/inputview/layouts/material/spacerow.js',
'src/chrome/os/inputview/layouts/material/util.js',
'src/chrome/os/inputview/layouts/rowsof101.js', 'src/chrome/os/inputview/layouts/rowsof101.js',
'src/chrome/os/inputview/layouts/rowsof102.js', 'src/chrome/os/inputview/layouts/rowsof102.js',
'src/chrome/os/inputview/layouts/rowsofcompact.js', 'src/chrome/os/inputview/layouts/rowsofcompact.js',
......
...@@ -45,6 +45,14 @@ namespaces = [ ...@@ -45,6 +45,14 @@ namespaces = [
'i18n.input.chrome.inputview.layouts.RowsOfNumberpad', 'i18n.input.chrome.inputview.layouts.RowsOfNumberpad',
'i18n.input.chrome.inputview.layouts.SpaceRow', 'i18n.input.chrome.inputview.layouts.SpaceRow',
'i18n.input.chrome.inputview.layouts.util', 'i18n.input.chrome.inputview.layouts.util',
'i18n.input.chrome.inputview.layouts.material.CompactSpaceRow',
'i18n.input.chrome.inputview.layouts.material.RowsOf101',
'i18n.input.chrome.inputview.layouts.material.RowsOf102',
'i18n.input.chrome.inputview.layouts.material.RowsOfCompact',
'i18n.input.chrome.inputview.layouts.material.RowsOfJP',
'i18n.input.chrome.inputview.layouts.material.RowsOfNumberpad',
'i18n.input.chrome.inputview.layouts.material.SpaceRow',
'i18n.input.chrome.inputview.layouts.material.util',
'i18n.input.hwt.util' 'i18n.input.hwt.util'
] ]
......
...@@ -57,6 +57,11 @@ ...@@ -57,6 +57,11 @@
<include name="IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD" file="${input_tools_root_dir}/inputview/layouts/compactkbd_numberpad_layout.js" type="BINDATA" /> <include name="IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD" file="${input_tools_root_dir}/inputview/layouts/compactkbd_numberpad_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_EMOJI" file="${input_tools_root_dir}/inputview/layouts/emoji_layout.js" type="BINDATA" /> <include name="IDR_KEYBOARD_LAYOUTS_EMOJI" file="${input_tools_root_dir}/inputview/layouts/emoji_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_HWT" file="${input_tools_root_dir}/inputview/layouts/handwriting_layout.js" type="BINDATA" /> <include name="IDR_KEYBOARD_LAYOUTS_HWT" file="${input_tools_root_dir}/inputview/layouts/handwriting_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_MATERIAL_101" file="${input_tools_root_dir}/inputview/layouts/material/101kbd_layout.js" type="BINDATA"/>
<include name="IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_QWERTY" file="${input_tools_root_dir}/inputview/layouts/material/compactkbd_qwerty_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_NUMBERPAD" file="${input_tools_root_dir}/inputview/layouts/material/compactkbd_numberpad_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_MATERIAL_EMOJI" file="${input_tools_root_dir}/inputview/layouts/material/emoji_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_LAYOUTS_MATERIAL_HWT" file="${input_tools_root_dir}/inputview/layouts/material/handwriting_layout.js" type="BINDATA" />
<include name="IDR_KEYBOARD_MANIFEST" file="resources/manifest.json" type="BINDATA" /> <include name="IDR_KEYBOARD_MANIFEST" file="resources/manifest.json" type="BINDATA" />
<include name="IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE" file="${input_tools_root_dir}/sounds/keypress-delete.wav" type="BINDATA" /> <include name="IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE" file="${input_tools_root_dir}/sounds/keypress-delete.wav" type="BINDATA" />
<include name="IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN" file="${input_tools_root_dir}/sounds/keypress-return.wav" type="BINDATA" /> <include name="IDR_KEYBOARD_SOUNDS_KEYPRESS_RETURN" file="${input_tools_root_dir}/sounds/keypress-return.wav" type="BINDATA" />
......
...@@ -370,6 +370,16 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { ...@@ -370,6 +370,16 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD}, IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
{"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI}, {"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
{"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT}, {"keyboard/inputview_layouts/handwriting.js", IDR_KEYBOARD_LAYOUTS_HWT},
{"keyboard/inputview_layouts/m-101kbd.js",
IDR_KEYBOARD_LAYOUTS_MATERIAL_101},
{"keyboard/inputview_layouts/m-compactkbd-qwerty.js",
IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_QWERTY},
{"keyboard/inputview_layouts/m-compactkbd-numberpad.js",
IDR_KEYBOARD_LAYOUTS_MATERIAL_COMPACT_NUMBERPAD},
{"keyboard/inputview_layouts/m-emoji.js",
IDR_KEYBOARD_LAYOUTS_MATERIAL_EMOJI},
{"keyboard/inputview_layouts/m-handwriting.js",
IDR_KEYBOARD_LAYOUTS_MATERIAL_HWT},
{"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST}, {"keyboard/manifest.json", IDR_KEYBOARD_MANIFEST},
{"keyboard/sounds/keypress-delete.wav", {"keyboard/sounds/keypress-delete.wav",
IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE}, IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment