Index: ui/keyboard/keyboard_util.cc |
diff --git a/ui/keyboard/keyboard_util.cc b/ui/keyboard/keyboard_util.cc |
index 919a00071f3e49c114f2773ff8829baabd00b83d..fa5ae4a7c4503ba57a7ddc89f914af86bb9d8b85 100644 |
--- a/ui/keyboard/keyboard_util.cc |
+++ b/ui/keyboard/keyboard_util.cc |
@@ -373,16 +373,28 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { |
// map cannot be used directly. |
static const GritResourceMap kKeyboardResources[] = { |
{"keyboard/locales/en.js", IDR_KEYBOARD_LOCALES_EN}, |
- {"keyboard/config/m-emoji.js", IDR_KEYBOARD_CONFIG_EMOJI}, |
- {"keyboard/config/m-hwt.js", IDR_KEYBOARD_CONFIG_HWT}, |
+ {"keyboard/config/emoji.js", IDR_KEYBOARD_CONFIG_EMOJI}, |
+ {"keyboard/config/hwt.js", IDR_KEYBOARD_CONFIG_HWT}, |
{"keyboard/config/us.js", IDR_KEYBOARD_CONFIG_US}, |
{"keyboard/emoji.css", IDR_KEYBOARD_CSS_EMOJI}, |
+ {"keyboard/images/3dots.png", IDR_KEYBOARD_IMAGES_3_DOTS}, |
+ {"keyboard/images/back_to_keyboard.png", |
+ IDR_KEYBOARD_IMAGES_BACK_TO_KEYBOARD}, |
{"keyboard/images/backspace.png", IDR_KEYBOARD_IMAGES_BACKSPACE}, |
{"keyboard/images/car.png", IDR_KEYBOARD_IMAGES_CAR}, |
{"keyboard/images/check.png", IDR_KEYBOARD_IMAGES_CHECK}, |
+ {"keyboard/images/check_in_menu.png", IDR_KEYBOARD_IMAGES_CHECK_IN_MENU}, |
{"keyboard/images/compact.png", IDR_KEYBOARD_IMAGES_COMPACT}, |
{"keyboard/images/down.png", IDR_KEYBOARD_IMAGES_DOWN}, |
{"keyboard/images/emoji.png", IDR_KEYBOARD_IMAGES_EMOJI}, |
+ {"keyboard/images/emoji_car.png", IDR_KEYBOARD_IMAGES_EMOJI_CAR}, |
+ {"keyboard/images/emoji_crown.png", IDR_KEYBOARD_IMAGES_EMOJI_CROWN}, |
+ {"keyboard/images/emoji_emoticon.png", |
+ IDR_KEYBOARD_IMAGES_EMOJI_EMOTICON}, |
+ {"keyboard/images/emoji_flower.png", IDR_KEYBOARD_IMAGES_EMOJI_FLOWER}, |
+ {"keyboard/images/emoji_hot.png", IDR_KEYBOARD_IMAGES_EMOJI_HOT}, |
+ {"keyboard/images/emoji_recent.png", IDR_KEYBOARD_IMAGES_EMOJI_RECENT}, |
+ {"keyboard/images/emoji_shape.png", IDR_KEYBOARD_IMAGES_EMOJI_SHAPE}, |
{"keyboard/images/emoji_cat_items.png", IDR_KEYBOARD_IMAGES_CAT}, |
{"keyboard/images/emoticon.png", IDR_KEYBOARD_IMAGES_EMOTICON}, |
{"keyboard/images/enter.png", IDR_KEYBOARD_IMAGES_RETURN}, |
@@ -390,7 +402,8 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { |
{"keyboard/images/favorit.png", IDR_KEYBOARD_IMAGES_FAVORITE}, |
{"keyboard/images/flower.png", IDR_KEYBOARD_IMAGES_FLOWER}, |
{"keyboard/images/globe.png", IDR_KEYBOARD_IMAGES_GLOBE}, |
- {"keyboard/images/hide.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, |
+ {"keyboard/images/hide.png", IDR_KEYBOARD_IMAGES_HIDE}, |
+ {"keyboard/images/hidekeyboard.png", IDR_KEYBOARD_IMAGES_HIDE_KEYBOARD}, |
{"keyboard/images/keyboard.svg", IDR_KEYBOARD_IMAGES_KEYBOARD}, |
{"keyboard/images/left.png", IDR_KEYBOARD_IMAGES_LEFT}, |
{"keyboard/images/penci.png", IDR_KEYBOARD_IMAGES_PENCIL}, |
@@ -400,10 +413,14 @@ const GritResourceMap* GetKeyboardExtensionResources(size_t* size) { |
{"keyboard/images/pencil.png", IDR_KEYBOARD_IMAGES_PENCIL}, |
{"keyboard/images/right.png", IDR_KEYBOARD_IMAGES_RIGHT}, |
{"keyboard/images/search.png", IDR_KEYBOARD_IMAGES_SEARCH}, |
+ {"keyboard/images/select_right.png", IDR_KEYBOARD_IMAGES_SELECT_RIGHT}, |
+ {"keyboard/images/select_left.png", IDR_KEYBOARD_IMAGES_SELECT_LEFT}, |
{"keyboard/images/setting.png", IDR_KEYBOARD_IMAGES_SETTINGS}, |
{"keyboard/images/shift.png", IDR_KEYBOARD_IMAGES_SHIFT}, |
{"keyboard/images/space.png", IDR_KEYBOARD_IMAGES_SPACE}, |
{"keyboard/images/tab.png", IDR_KEYBOARD_IMAGES_TAB}, |
+ {"keyboard/images/tab_in_fullsize.png", |
+ IDR_KEYBOARD_IMAGES_TAB_IN_FULLSIZE}, |
{"keyboard/images/triangle.png", IDR_KEYBOARD_IMAGES_TRIANGLE}, |
{"keyboard/images/up.png", IDR_KEYBOARD_IMAGES_UP}, |
{"keyboard/index.html", IDR_KEYBOARD_INDEX}, |
@@ -417,16 +434,6 @@ 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}, |