Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(876)

Unified Diff: ui/keyboard/keyboard_util.cc

Issue 1033773002: Fixes grit not pulling in material design files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix >80 line length Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/keyboard/keyboard_util.cc
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc
index 480dd67d299a121998fe36b9c0964837b6532eb3..c15d561337260e76f3bda47e71f8b499d1040bf6 100644
--- a/ui/keyboard/keyboard_util.cc
+++ b/ui/keyboard/keyboard_util.cc
@@ -370,6 +370,16 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) {
IDR_KEYBOARD_LAYOUTS_COMPACT_NUMBERPAD},
{"keyboard/inputview_layouts/emoji.js", IDR_KEYBOARD_LAYOUTS_EMOJI},
{"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/sounds/keypress-delete.wav",
IDR_KEYBOARD_SOUNDS_KEYPRESS_DELETE},
« no previous file with comments | « ui/keyboard/keyboard_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698