Request focus on IME menu rows after keyboard selection

ash/common/system/chromeos/ime_menu/ime_list_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/chromeos/ime_menu/ime_list_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/ime_info.h"
 #include "ash/common/system/tray/system_menu_button.h"
@@ skipping 123 matching lines @@
       tri_view->AddView(TriView::Container::END, checked_image);
     }
     SetAccessibleName(label_->text());
   }
 
   ~ImeListItemView() override {}
 
   // ActionableView:
   bool PerformAction(const ui::Event& event) override {
     ime_list_view_->HandleViewClicked(this);
+
+    if (ime_list_view_->focus_current_ime() &&
+        event.type() == ui::EventType::ET_KEY_PRESSED) {
+      ime_list_view_->SetLastItemSelectedWithKeyboard(true);
+    } else {
+      ime_list_view_->CloseImeListView();
+    }
+
     return true;
   }
 
   void OnFocus() override {
     ActionableView::OnFocus();
     if (ime_list_view_ && ime_list_view_->scroll_content())
       ime_list_view_->scroll_content()->ScrollRectToVisible(bounds());
   }
 
   // views::View:
@@ skipping 92 matching lines @@
 
   // ToggleButton to toggle keyboard on or off.
   views::ToggleButton* toggle_;
 
   DISALLOW_COPY_AND_ASSIGN(MaterialKeyboardStatusRowView);
 };
 
 ImeListView::ImeListView(SystemTrayItem* owner,
                          bool show_keyboard_toggle,
                          SingleImeBehavior single_ime_behavior)
-    : TrayDetailsView(owner) {
+    : TrayDetailsView(owner),
+      last_item_selected_with_keyboard_(false),
+      focus_current_ime_(false) {
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   IMEInfoList list;
   delegate->GetAvailableIMEList(&list);
   IMEPropertyInfoList property_list;
   delegate->GetCurrentIMEProperties(&property_list);
   Update(list, property_list, show_keyboard_toggle, single_ime_behavior);
 }
 
 ImeListView::~ImeListView() {}
 
@@ skipping 22 matching lines @@
       PrependMaterialKeyboardStatus();
     } else {
       if (list.size() > 1 || !property_list.empty())
         AddScrollSeparator();
       AppendKeyboardStatus();
     }
   }
 
   Layout();
   SchedulePaint();
+
+  if (focus_current_ime_ && last_item_selected_with_keyboard_)
+    FocusCurrentImeIfNeeded();
 }
 
 void ImeListView::ResetImeListView() {
   // Children are removed from the view hierarchy and deleted in Reset().
   Reset();
   material_keyboard_status_view_ = nullptr;
   keyboard_status_ = nullptr;
 }
 
+void ImeListView::CloseImeListView() {
+  last_selected_item_id_.clear();
+  last_item_selected_with_keyboard_ = false;
+  GetWidget()->Close();
+}
+
 void ImeListView::AppendIMEList(const IMEInfoList& list) {
   DCHECK(ime_map_.empty());
   for (size_t i = 0; i < list.size(); i++) {
     HoverHighlightView* container =
         new SelectableHoverHighlightView(this, list[i].name, list[i].selected);
     scroll_content()->AddChildView(container);
     ime_map_[container] = list[i].id;
   }
 }
 
@@ skipping 64 matching lines @@
   DCHECK(!material_keyboard_status_view_);
   MaterialKeyboardStatusRowView* view =
       new MaterialKeyboardStatusRowView(this, keyboard::IsKeyboardEnabled());
   scroll_content()->AddChildViewAt(view, 0);
   material_keyboard_status_view_ = view;
 }
 
 void ImeListView::HandleViewClicked(views::View* view) {
   if (view == keyboard_status_) {
     WmShell::Get()->ToggleIgnoreExternalKeyboard();
+    last_selected_item_id_.clear();
+    last_item_selected_with_keyboard_ = false;
     return;
   }
 
   SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
   std::map<views::View*, std::string>::const_iterator ime = ime_map_.find(view);
   if (ime != ime_map_.end()) {
     WmShell::Get()->RecordUserMetricsAction(UMA_STATUS_AREA_IME_SWITCH_MODE);
     std::string ime_id = ime->second;
+    last_selected_item_id_ = ime_id;
     delegate->SwitchIME(ime_id);
   } else {
     std::map<views::View*, std::string>::const_iterator property =
         property_map_.find(view);
     if (property == property_map_.end())
       return;
     const std::string key = property->second;
+    last_selected_item_id_ = key;
     delegate->ActivateIMEProperty(key);
-  }
-
-  GetWidget()->Close();
+  };
 }
 
 void ImeListView::HandleButtonPressed(views::Button* sender,
                                       const ui::Event& event) {
   if (material_keyboard_status_view_ &&
       sender == material_keyboard_status_view_->toggle()) {
     WmShell::Get()->ToggleIgnoreExternalKeyboard();
+    last_selected_item_id_.clear();
+    last_item_selected_with_keyboard_ = false;
   }
 }
 
+void ImeListView::FocusCurrentImeIfNeeded() {
+  views::FocusManager* manager = GetFocusManager();
+  if (!manager || manager->GetFocusedView() || last_selected_item_id_.empty())
+    return;
+
+  for (auto ime_map : ime_map_) {
+    if (ime_map.second == last_selected_item_id_)
+      (ime_map.first)->RequestFocus();
+  }
+}
+
 }  // namespace ash