Correctly handle tab navigation in the app list.

chrome/browser/apps/custom_launcher_page_browsertest_views.cc

Index: chrome/browser/apps/custom_launcher_page_browsertest_views.cc
diff --git a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
index 8f4fb35a5e60229607c314680c7920f74d81dc80..561280b74e2efc66ee70284e35214ffd7b76ae2b 100644
--- a/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
+++ b/chrome/browser/apps/custom_launcher_page_browsertest_views.cc
@@ -20,8 +20,11 @@
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/app_list/views/contents_view.h"
+#include "ui/app_list/views/search_box_view.h"
 #include "ui/events/test/event_generator.h"
+#include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/focus/focus_manager.h"
 
 namespace {
 
@@ -383,3 +386,43 @@ IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest, LauncherPageSetEnabled) {
   EXPECT_TRUE(model->custom_launcher_page_enabled());
   EXPECT_TRUE(custom_page_view->visible());
 }
+
+IN_PROC_BROWSER_TEST_F(CustomLauncherPageBrowserTest,
+                       LauncherPageFocusTraversal) {
+  LoadAndLaunchPlatformApp(kCustomLauncherPagePath, "Launched");
+  app_list::AppListView* app_list_view = GetAppListView();
+  app_list::ContentsView* contents_view =
+      app_list_view->app_list_main_view()->contents_view();
+  app_list::SearchBoxView* search_box_view =
+      app_list_view->app_list_main_view()->search_box_view();
+
+  ASSERT_TRUE(
+      contents_view->IsStateActive(app_list::AppListModel::STATE_START));
+  EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
+            search_box_view->search_box());
+
+  {
+    ExtensionTestMessageListener listener("onPageProgressAt1", false);
+    contents_view->SetActivePage(contents_view->GetPageIndexForState(
+        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
+    listener.WaitUntilSatisfied();
+    EXPECT_TRUE(contents_view->IsStateActive(
+        app_list::AppListModel::STATE_CUSTOM_LAUNCHER_PAGE));
+    EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
+              search_box_view->search_box());
+  }
+  {
+    ExtensionTestMessageListener listener("textfieldFocused", false);
+    app_list_view->GetFocusManager()->AdvanceFocus(false);
+    listener.WaitUntilSatisfied();
+    EXPECT_NE(app_list_view->GetFocusManager()->GetFocusedView(),
+              search_box_view->search_box());
+  }
+  {
+    ExtensionTestMessageListener listener("textfieldBlurred", false);
+    app_list_view->GetFocusManager()->AdvanceFocus(false);
+    listener.WaitUntilSatisfied();
+    EXPECT_EQ(app_list_view->GetFocusManager()->GetFocusedView(),
+              search_box_view->search_box());
+  }
+}