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 27 matching lines @@
 constexpr SkColor kSeparatorColor = SkColorSetARGBMacro(0x1F, 0x00, 0x00, 0x00);
 
 }  // namespace
 
 namespace app_list {
 
 SearchResultTileItemListView::SearchResultTileItemListView(
     views::Textfield* search_box,
     AppListViewDelegate* view_delegate)
     : search_box_(search_box),
       is_play_store_app_search_enabled_(

[khmel, 2017/07/17 17:16:12]

Q: I think this is not enough to check.
This feature might be set but:

1. Profile is not allowed to have ARC. What is behavior in this casE?
2. ARC might not contain Play Store app. See IsPlayStoreAvailable. 
3. ARC can be opted out this time.

Is is expected that in all this cases we have different layout?

[Jiaquan He, 2017/07/18 03:32:45]

Yes. We only enable this feature in the new launcher, and we want the layout be
constant in all these cases.

           features::IsPlayStoreAppSearchEnabled()) {
   if (is_play_store_app_search_enabled_) {
     SetLayoutManager(new views::BoxLayout(
         views::BoxLayout::kHorizontal,
         gfx::Insets(kItemListVerticalSpacing, kItemListHorizontalSpacing),
         kBetweenItemSpacing));
     for (size_t i = 0; i < kMaxNumSearchResultTiles; ++i) {
       views::Separator* separator = new views::Separator;
       separator->SetVisible(false);
       separator->SetBorder(views::CreateEmptyBorder(
@@ skipping 103 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
+                                                      : 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