| Index: ash/common/system/ime/tray_ime_chromeos.cc
|
| diff --git a/ash/common/system/ime/tray_ime_chromeos.cc b/ash/common/system/ime/tray_ime_chromeos.cc
|
| index 8b69585bbd04986a522a33bc42a0238ac7586e2c..8ebb5d4c0167fd148a11559e56ab53fdf4d319e5 100644
|
| --- a/ash/common/system/ime/tray_ime_chromeos.cc
|
| +++ b/ash/common/system/ime/tray_ime_chromeos.cc
|
| @@ -118,27 +118,26 @@ class IMEDetailedView : public ImeListView {
|
| ImeListView::Update(list, property_list, show_keyboard_toggle,
|
| single_ime_behavior);
|
| if (login_ != LoginStatus::NOT_LOGGED_IN && login_ != LoginStatus::LOCKED &&
|
| - !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen())
|
| + !WmShell::Get()
|
| + ->GetSessionStateDelegate()
|
| + ->IsInSecondaryLoginScreen()) {
|
| AppendSettings();
|
| - AppendHeaderEntry();
|
| + }
|
| +
|
| + CreateTitleRow(IDS_ASH_STATUS_TRAY_IME, this);
|
| }
|
|
|
| private:
|
| // ImeListView:
|
| - void OnViewClicked(views::View* sender) override {
|
| - ImeListView::OnViewClicked(sender);
|
| - SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
|
| - if (sender == footer()->content()) {
|
| - TransitionToDefaultView();
|
| - } else if (sender == settings_) {
|
| + void HandleViewClicked(views::View* view) override {
|
| + ImeListView::HandleViewClicked(view);
|
| + if (view == settings_) {
|
| WmShell::Get()->RecordUserMetricsAction(
|
| UMA_STATUS_AREA_IME_SHOW_DETAILED);
|
| - delegate->ShowIMESettings();
|
| + WmShell::Get()->system_tray_delegate()->ShowIMESettings();
|
| }
|
| }
|
|
|
| - void AppendHeaderEntry() { CreateSpecialRow(IDS_ASH_STATUS_TRAY_IME, this); }
|
| -
|
| void AppendSettings() {
|
| HoverHighlightView* container = new HoverHighlightView(this);
|
| container->AddLabel(
|
|
|