Refactors the auto-launch logic and adds tests for it.

ui/app_list/views/contents_view.cc

 // Copyright (c) 2012 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/contents_view.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "ui/app_list/app_list_constants.h"
@@ skipping 32 matching lines @@
 }
 
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            PaginationModel* pagination_model,
                            AppListModel* model,
                            AppListViewDelegate* view_delegate)
     : show_state_(SHOW_APPS),
       pagination_model_(pagination_model),
-      view_delegate_(view_delegate),
       view_model_(new views::ViewModel),
       bounds_animator_(new views::BoundsAnimator(this)) {
   DCHECK(model);
   pagination_model_->SetTransitionDurations(
       kPageTransitionDurationInMs,
       kOverscrollPageTransitionDurationMs);
 
   content::WebContents* start_page_contents =
       view_delegate ? view_delegate->GetStartPageContents() : NULL;
   apps_container_view_ = new AppsContainerView(
       app_list_main_view, pagination_model, model, start_page_contents);
   AddChildView(apps_container_view_);
   view_model_->Add(apps_container_view_, kIndexAppsContainer);
 
   SearchResultListView* search_results_view = new SearchResultListView(
-      app_list_main_view);
+      app_list_main_view, view_delegate);
   AddChildView(search_results_view);
   view_model_->Add(search_results_view, kIndexSearchResults);
 
   GetSearchResultListView(view_model_.get())->SetResults(model->results());
 }
 
 ContentsView::~ContentsView() {
 }
 
 void ContentsView::CancelDrag() {
   if (apps_container_view_->apps_grid_view()->has_dragged_view())
     apps_container_view_->apps_grid_view()->EndDrag(true);
 }
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
-  if (show_state_ == SHOW_SEARCH_RESULTS) {
-    // TODO(xiyuan): Highlight default match instead of the first.
-    SearchResultListView* results_view =
-        GetSearchResultListView(view_model_.get());
-    if (results_view->visible())
-      results_view->SetSelectedIndex(0);
-  }
+  SearchResultListView* results_view =
+      GetSearchResultListView(view_model_.get());
+  // TODO(xiyuan): Highlight default match instead of the first.
+  if (show_state_ == SHOW_SEARCH_RESULTS && results_view->visible())
+    results_view->SetSelectedIndex(0);
+  results_view->UpdateAutoLaunchState();
 
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   gfx::Rect container_frame(rect);
@@ skipping 22 matching lines @@
 void ContentsView::AnimateToIdealBounds() {
   CalculateIdealBounds();
   for (int i = 0; i < view_model_->view_size(); ++i) {
     bounds_animator_->AnimateViewTo(view_model_->view_at(i),
                                     view_model_->ideal_bounds(i));
   }
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   SetShowState(show ? SHOW_SEARCH_RESULTS : SHOW_APPS);
-  SearchResultListView* results_view =
-      GetSearchResultListView(view_model_.get());
-  if (show)
-    results_view->SetAutoLaunchTimeout(view_delegate_->GetAutoLaunchTimeout());
-  else
-    results_view->CancelAutoLaunchTimeout();
 }
 
 void ContentsView::ShowFolderContent(AppListFolderItem* item) {
   apps_container_view_->ShowActiveFolder(item);
 }
 
-void ContentsView::CancelAutoLaunch() {
-  GetSearchResultListView(view_model_.get())->CancelAutoLaunchTimeout();
-  view_delegate_->AutoLaunchCanceled();
-}
-
 void ContentsView::Prerender() {
   const int selected_page = std::max(0, pagination_model_->selected_page());
   apps_container_view_->apps_grid_view()->Prerender(selected_page);
 }
 
 gfx::Size ContentsView::GetPreferredSize() {
   const gfx::Size container_size = GetAppsContainerView(view_model_.get())->
       apps_grid_view()->GetPreferredSize();
   const gfx::Size results_size =
       GetSearchResultListView(view_model_.get())->GetPreferredSize();
 
   int width = std::max(container_size.width(), results_size.width());
   int height = std::max(container_size.height(), results_size.height());
   return gfx::Size(width, height);
 }
 
 void ContentsView::Layout() {
   CalculateIdealBounds();
   views::ViewModelUtils::SetViewBoundsToIdealBounds(*view_model_);
 }
 
 bool ContentsView::OnKeyPressed(const ui::KeyEvent& event) {
-  CancelAutoLaunch();
   switch (show_state_) {
     case SHOW_APPS:
       return GetAppsContainerView(view_model_.get())->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
       return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
     default:
       NOTREACHED() << "Unknown show state " << show_state_;
   }
   return false;
 }
@@ skipping 71 matching lines @@
     if (!pagination_model_->has_transition()) {
       pagination_model_->SelectPageRelative(offset > 0 ? -1 : 1,
                                             true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list