Slight refactor of search result handling in ContentsView.

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 64 matching lines @@
 
 void ContentsView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   apps_container_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 void ContentsView::SetActivePage(int page_index) {
   if (active_page_ == page_index)
     return;
 
-  active_page_ = page_index;
-  ActivePageChanged();
+  SetActivePageInternal(page_index, false);
 }
 
 bool ContentsView::IsNamedPageActive(NamedPage named_page) const {
   std::map<NamedPage, int>::const_iterator it =
       named_page_to_view_.find(named_page);
   if (it == named_page_to_view_.end())
     return false;
   return it->second == active_page_;
 }
 
 int ContentsView::GetPageIndexForNamedPage(NamedPage named_page) const {
   // Find the index of the view corresponding to the given named_page.
   std::map<NamedPage, int>::const_iterator it =
       named_page_to_view_.find(named_page);
   // GetPageIndexForNamedPage should never be called on a named_page that does
   // not have a corresponding view.
   DCHECK(it != named_page_to_view_.end());
   return it->second;
 }
 
-void ContentsView::ActivePageChanged() {
+void ContentsView::SetActivePageInternal(int page_index,
+                                         bool show_search_results) {
+  active_page_ = page_index;
+  ActivePageChanged(show_search_results);
+}
+
+void ContentsView::ActivePageChanged(bool show_search_results) {
   // TODO(xiyuan): Highlight default match instead of the first.
   if (IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS) &&
       search_results_view_->visible()) {
     search_results_view_->SetSelectedIndex(0);
   }
   if (search_results_view_)
     search_results_view_->UpdateAutoLaunchState();
 
-  if (IsNamedPageActive(NAMED_PAGE_START))
-    start_page_view_->Reset();
+  if (IsNamedPageActive(NAMED_PAGE_START)) {
+    if (show_search_results)
+      start_page_view_->ShowSearchResults();
+    else
+      start_page_view_->Reset();
+  }
 
   // Notify parent AppListMainView of the page change.
   app_list_main_view_->UpdateSearchBoxVisibility();
 
   AnimateToIdealBounds();
 }
 
 void ContentsView::ShowSearchResults(bool show) {
   NamedPage new_named_page = show ? NAMED_PAGE_SEARCH_RESULTS : NAMED_PAGE_APPS;
   if (app_list::switches::IsExperimentalAppListEnabled())
     new_named_page = NAMED_PAGE_START;
 
-  SetActivePage(GetPageIndexForNamedPage(new_named_page));
-
-  if (app_list::switches::IsExperimentalAppListEnabled()) {
-    if (show)
-      start_page_view_->ShowSearchResults();
-    else
-      start_page_view_->Reset();
-    app_list_main_view_->UpdateSearchBoxVisibility();
-  }
+  SetActivePageInternal(GetPageIndexForNamedPage(new_named_page), show);
 }
 
 bool ContentsView::IsShowingSearchResults() const {
   return app_list::switches::IsExperimentalAppListEnabled()
              ? IsNamedPageActive(NAMED_PAGE_START) &&
                    start_page_view_->IsShowingSearchResults()
              : IsNamedPageActive(NAMED_PAGE_SEARCH_RESULTS);
 }
 
 void ContentsView::CalculateIdealBounds() {
@@ skipping 160 matching lines @@
   if (std::abs(offset) > kMinScrollToSwitchPage) {
     if (!GetAppsPaginationModel()->has_transition()) {
       GetAppsPaginationModel()->SelectPageRelative(offset > 0 ? -1 : 1, true);
     }
     event->SetHandled();
     event->StopPropagation();
   }
 }
 
 }  // namespace app_list