Chromium Code Reviews| Index: ash/common/system/chromeos/ime_menu/ime_menu_tray.cc |
| diff --git a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc |
| index 4453ad526b30efb48793162702654a6623ea204a..d59b95c610e80057ad7e19147b8ccdd1d8282ca9 100644 |
| --- a/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc |
| +++ b/ash/common/system/chromeos/ime_menu/ime_menu_tray.cc |
| @@ -80,15 +80,27 @@ class ImeButtonsView : public views::View, public views::ButtonListener { |
| SetLayoutManager(box_layout); |
| if (show_emoji_button) { |
| - // TODO(azurewei): Creates the proper button with icons. |
| + emoji_button_ = CreateImeMenuButton( |
| + this, IDR_AURA_UBER_TRAY_EMOJI, IDR_AURA_UBER_TRAY_EMOJI, |
| + IDR_AURA_UBER_TRAY_EMOJI, IDR_AURA_UBER_TRAY_EMOJI, |
| + IDS_ASH_STATUS_TRAY_EMOJI, IDS_ASH_STATUS_TRAY_EMOJI, 1); |
|
James Cook
2016/08/23 16:01:22
nit: Use a constant for 1, like const int right_bo
Azure Wei
2016/09/18 05:40:02
Removed this border.
|
| + AddChildView(emoji_button_); |
| } |
| if (show_voice_button) { |
| - // TODO(azurewei): Creates the proper button with icons. |
| + voice_button_ = CreateImeMenuButton( |
| + this, IDR_AURA_UBER_TRAY_VOICE, IDR_AURA_UBER_TRAY_VOICE, |
| + IDR_AURA_UBER_TRAY_VOICE, IDR_AURA_UBER_TRAY_VOICE, |
|
James Cook
2016/08/23 16:01:22
Should there be separate artwork for the disabled
Azure Wei
2016/09/18 05:40:02
Updated with vectorized icons instead of PNGs.
|
| + IDS_ASH_STATUS_TRAY_VOICE, IDS_ASH_STATUS_TRAY_VOICE, 1); |
| + AddChildView(voice_button_); |
| } |
| if (show_handwriting_button) { |
| - // TODO(azurewei): Creates the proper button with icons. |
| + handwriting_button_ = CreateImeMenuButton( |
| + this, IDR_AURA_UBER_TRAY_HANDWRITING, IDR_AURA_UBER_TRAY_HANDWRITING, |
| + IDR_AURA_UBER_TRAY_HANDWRITING, IDR_AURA_UBER_TRAY_HANDWRITING, |
| + IDS_ASH_STATUS_TRAY_HANDWRITING, IDS_ASH_STATUS_TRAY_HANDWRITING, 1); |
| + AddChildView(handwriting_button_); |
| } |
| if (show_settings_button) { |