| Index: ash/system/ime_menu/ime_menu_tray.cc
|
| diff --git a/ash/system/ime_menu/ime_menu_tray.cc b/ash/system/ime_menu/ime_menu_tray.cc
|
| index d8ba180dae148d268960237d7de210572319b905..daa09b1426c43a2f30730e1d9db0e70a0f75b0b7 100644
|
| --- a/ash/system/ime_menu/ime_menu_tray.cc
|
| +++ b/ash/system/ime_menu/ime_menu_tray.cc
|
| @@ -98,7 +98,12 @@ bool IsInPasswordInputContext() {
|
|
|
| class ImeMenuLabel : public views::Label {
|
| public:
|
| - ImeMenuLabel() {}
|
| + ImeMenuLabel() {
|
| + // Sometimes the label will be more than 2 characters, e.g. INTL and EXTD.
|
| + // This border makes sure we only leave room for ~2 and the others are
|
| + // truncated.
|
| + SetBorder(views::CreateEmptyBorder(gfx::Insets(0, 6)));
|
| + }
|
| ~ImeMenuLabel() override {}
|
|
|
| // views:Label:
|
| @@ -281,6 +286,7 @@ ImeMenuTray::ImeMenuTray(WmShelf* wm_shelf)
|
| show_bubble_after_keyboard_hidden_(false) {
|
| SetInkDropMode(InkDropMode::ON);
|
| SetupLabelForTray(label_);
|
| + label_->SetElideBehavior(gfx::TRUNCATE);
|
| tray_container()->AddChildView(label_);
|
| SystemTrayNotifier* tray_notifier = Shell::Get()->system_tray_notifier();
|
| tray_notifier->AddIMEObserver(this);
|
|
|