Fix app list item indexing bug.

ui/app_list/views/search_result_tile_item_list_view.cc

 // Copyright 2014 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 "ui/app_list/views/search_result_tile_item_list_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 151 matching lines @@
   if (old_selected >= 0)
     tile_views_[old_selected]->SetSelected(false);
 
   if (new_selected >= 0) {
     tile_views_[new_selected]->SetSelected(true);
     ScrollRectToVisible(GetLocalBounds());
   }
 }
 
 bool SearchResultTileItemListView::OnKeyPressed(const ui::KeyEvent& event) {
-  if (selected_index() >= 0 && child_at(selected_index())->OnKeyPressed(event))
+  int selection_index = selected_index();
+  // Also count the separator when Play Store app search feature is enabled.
+  int child_index = is_play_store_app_search_enabled_ ? selection_index * 2 + 1

[khmel, 2017/07/18 15:04:01]

nit: const int

[Jiaquan He, 2017/07/18 15:58:16]

Done.

+                                                      : selection_index;
+  if (selection_index >= 0 && child_at(child_index)->OnKeyPressed(event))
     return true;
 
   int dir = 0;
   bool cursor_at_end_of_searchbox =
       search_box_->GetCursorPosition() == search_box_->text().length();
   const int forward_dir = base::i18n::IsRTL() ? -1 : 1;
   switch (event.key_code()) {
     case ui::VKEY_TAB:
       if (event.IsShiftDown())
         dir = -1;
@@ skipping 14 matching lines @@
       // text.
       if (cursor_at_end_of_searchbox)
         dir = forward_dir;
       break;
     default:
       break;
   }
   if (dir == 0)
     return false;
 
-  int selection_index = selected_index() + dir;
+  selection_index = selection_index + dir;
   if (IsValidSelectionIndex(selection_index)) {
     SetSelectedIndex(selection_index);
     return true;
   }
 
   return false;
 }
 
 }  // namespace app_list