summaryrefslogtreecommitdiffstats
path: root/third_party/google_input_tools
diff options
context:
space:
mode:
authorrsadam <rsadam@chromium.org>2015-03-24 16:29:38 -0700
committerCommit bot <commit-bot@chromium.org>2015-03-24 23:30:09 +0000
commit97267fe2e7b92b46c88ae663c563d7a285ed02bf (patch)
treeba81804a40afe182c508536cb448908e8aed8b15 /third_party/google_input_tools
parent625a0c7daf175770733234a1ba3a2ebb70e4c107 (diff)
downloadchromium_src-97267fe2e7b92b46c88ae663c563d7a285ed02bf.zip
chromium_src-97267fe2e7b92b46c88ae663c563d7a285ed02bf.tar.gz
chromium_src-97267fe2e7b92b46c88ae663c563d7a285ed02bf.tar.bz2
Fixes grit not pulling in material design files.
BUG=470229 Review URL: https://codereview.chromium.org/1033773002 Cr-Commit-Position: refs/heads/master@{#322089}
Diffstat (limited to 'third_party/google_input_tools')
-rw-r--r--third_party/google_input_tools/inputview.gypi6
-rwxr-xr-xthird_party/google_input_tools/update.py8
2 files changed, 14 insertions, 0 deletions
diff --git a/third_party/google_input_tools/inputview.gypi b/third_party/google_input_tools/inputview.gypi
index 77b8687..110cd4d 100644
--- a/third_party/google_input_tools/inputview.gypi
+++ b/third_party/google_input_tools/inputview.gypi
@@ -86,6 +86,12 @@
'src/chrome/os/inputview/inputtoolcode.js',
'src/chrome/os/inputview/keyboardcontainer.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/rowsof102.js',
'src/chrome/os/inputview/layouts/rowsofcompact.js',
diff --git a/third_party/google_input_tools/update.py b/third_party/google_input_tools/update.py
index dc0800f..652e658 100755
--- a/third_party/google_input_tools/update.py
+++ b/third_party/google_input_tools/update.py
@@ -45,6 +45,14 @@ namespaces = [
'i18n.input.chrome.inputview.layouts.RowsOfNumberpad',
'i18n.input.chrome.inputview.layouts.SpaceRow',
'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'
]