| Index: ui/app_list/search_result_list_view.cc
|
| diff --git a/ui/app_list/search_result_list_view.cc b/ui/app_list/search_result_list_view.cc
|
| index 2892224d2ef70504d2ce6e5af96eb75043c9f523..cf8e381c0068c3674d868bdd06e6c859286dca76 100644
|
| --- a/ui/app_list/search_result_list_view.cc
|
| +++ b/ui/app_list/search_result_list_view.cc
|
| @@ -72,6 +72,24 @@ bool SearchResultListView::IsResultViewSelected(
|
| result_view;
|
| }
|
|
|
| +bool SearchResultListView::OnKeyPressed(const views::KeyEvent& event) {
|
| + switch (event.key_code()) {
|
| + case ui::VKEY_UP:
|
| + SetSelectedIndex(std::max(selected_index_ - 1, 0));
|
| + return true;
|
| + case ui::VKEY_DOWN:
|
| + SetSelectedIndex(std::min(selected_index_ + 1, last_visible_index_));
|
| + return true;
|
| + case ui::VKEY_RETURN:
|
| + if (selected_index_ >= 0)
|
| + ButtonPressed(GetResultViewAt(selected_index_), event);
|
| + return true;
|
| + default:
|
| + break;
|
| + }
|
| + return false;
|
| +}
|
| +
|
| SearchResultView* SearchResultListView::GetResultViewAt(int index) {
|
| DCHECK(index >= 0 && index < child_count());
|
| return static_cast<SearchResultView*>(child_at(index));
|
| @@ -108,24 +126,6 @@ void SearchResultListView::ScheduleUpdate() {
|
| }
|
| }
|
|
|
| -bool SearchResultListView::OnKeyPressed(const views::KeyEvent& event) {
|
| - switch (event.key_code()) {
|
| - case ui::VKEY_UP:
|
| - SetSelectedIndex(std::max(selected_index_ - 1, 0));
|
| - return true;
|
| - case ui::VKEY_DOWN:
|
| - SetSelectedIndex(std::min(selected_index_ + 1, last_visible_index_));
|
| - return true;
|
| - case ui::VKEY_RETURN:
|
| - if (selected_index_ >= 0)
|
| - ButtonPressed(GetResultViewAt(selected_index_), event);
|
| - return true;
|
| - default:
|
| - break;
|
| - }
|
| - return false;
|
| -}
|
| -
|
| void SearchResultListView::ButtonPressed(views::Button* sender,
|
| const views::Event& event) {
|
| if (sender->GetClassName() != SearchResultView::kViewClassName)
|
|
|