Refocus app list search box when dialogs are closed.

ui/app_list/views/app_list_view_unittest.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/app_list_view.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 93 matching lines @@
 
   // Tests switching rapidly between multiple pages of the launcher.
   void RunPageSwitchingAnimationTest();
 
   // Tests changing the App List profile.
   void RunProfileChangeTest();
 
   // Tests displaying of the search results.
   void RunSearchResultsTest();
 
+  // Tests displaying the app list overlay.
+  void RunAppListOverlayTest();
+
   // A standard set of checks on a view, e.g., ensuring it is drawn and visible.
   static void CheckView(views::View* subview);
 
   // Invoked when the Widget is closing, and the view it contains is about to
   // be torn down. This only occurs in a run loop and will be used as a signal
   // to quit.
   void NativeWidgetClosing() {
     view_ = NULL;
     run_loop_->Quit();
   }
@@ skipping 535 matching lines @@
               main_view->search_box_view()->search_box()->text());
     contents_view->Layout();
     EXPECT_TRUE(IsStateShown(AppListModel::STATE_SEARCH_RESULTS));
     EXPECT_TRUE(
         CheckSearchBoxWidget(contents_view->GetDefaultSearchBoxBounds()));
   }
 
   Close();
 }
 
+void AppListViewTestContext::RunAppListOverlayTest() {
+  Show();
+
+  AppListMainView* main_view = view_->app_list_main_view();
+  SearchBoxView* search_box_view = main_view->search_box_view();
+
+  // The search box should not be enabled when the app list overlay is shown.
+  view_->SetAppListOverlayVisible(true);
+  EXPECT_FALSE(search_box_view->enabled());
+
+  // The search box should be refocused when the app list overlay is hidden.
+  view_->SetAppListOverlayVisible(false);
+  EXPECT_TRUE(search_box_view->enabled());
+  EXPECT_EQ(search_box_view->search_box(),
+            view_->GetWidget()->GetFocusManager()->GetFocusedView());
+
+  Close();
+}
+
 class AppListViewTestAura : public views::ViewsTestBase,
                             public ::testing::WithParamInterface<int> {
  public:
   AppListViewTestAura() {}
   virtual ~AppListViewTestAura() {}
 
   // testing::Test overrides:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
 
@@ skipping 139 matching lines @@
 
 // Tests that the back button navigates through the app list correctly.
 TEST_P(AppListViewTestAura, BackTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunBackTest());
 }
 
 TEST_P(AppListViewTestDesktop, BackTest) {
   EXPECT_NO_FATAL_FAILURE(test_context_->RunBackTest());
 }
 
+// Tests that the correct views are displayed for showing search results.
+TEST_P(AppListViewTestAura, AppListOverlayTest) {
+  EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest());
+}
+
+TEST_P(AppListViewTestDesktop, AppListOverlayTest) {
+  EXPECT_NO_FATAL_FAILURE(test_context_->RunAppListOverlayTest());
+}
+
 #if defined(USE_AURA)
 INSTANTIATE_TEST_CASE_P(AppListViewTestAuraInstance,
                         AppListViewTestAura,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 #endif
 
 INSTANTIATE_TEST_CASE_P(AppListViewTestDesktopInstance,
                         AppListViewTestDesktop,
                         ::testing::Range<int>(TEST_TYPE_START, TEST_TYPE_END));
 
 }  // namespace test
 }  // namespace app_list