Refactor app list ContentsView to use pointer members to find views.

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 19 matching lines @@
 const int kIndexAppsContainer = 0;
 const int kIndexSearchResults = 1;
 const int kIndexStartPage = 2;
 
 const int kMinMouseWheelToSwitchPage = 20;
 const int kMinScrollToSwitchPage = 20;
 const int kMinHorizVelocityToSwitchPage = 800;
 
 const double kFinishTransitionThreshold = 0.33;
 
-AppsContainerView* GetAppsContainerView(views::ViewModel* model) {
-  return static_cast<AppsContainerView*>(model->view_at(kIndexAppsContainer));
-}
-
-SearchResultListView* GetSearchResultListView(views::ViewModel* model) {
-  return static_cast<SearchResultListView*>(
-      model->view_at(kIndexSearchResults));
-}
-
-StartPageView* GetStartPageView(views::ViewModel* model) {
-  return static_cast<StartPageView*>(model->view_at(kIndexStartPage));
-}
-
 }  // namespace
 
 ContentsView::ContentsView(AppListMainView* app_list_main_view,
                            AppListModel* model,
                            AppListViewDelegate* view_delegate)
     : show_state_(SHOW_APPS),
       start_page_view_(NULL),
       app_list_main_view_(app_list_main_view),
       view_model_(new views::ViewModel),
       bounds_animator_(new views::BoundsAnimator(this)) {
   DCHECK(model);
 
   apps_container_view_ = new AppsContainerView(app_list_main_view, model);
   AddChildView(apps_container_view_);
   view_model_->Add(apps_container_view_, kIndexAppsContainer);
 
-  SearchResultListView* search_results_view = new SearchResultListView(
-      app_list_main_view, view_delegate);
-  AddChildView(search_results_view);
-  view_model_->Add(search_results_view, kIndexSearchResults);
+  search_results_view_ =
+      new SearchResultListView(app_list_main_view, view_delegate);
+  AddChildView(search_results_view_);
+  view_model_->Add(search_results_view_, kIndexSearchResults);
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
     start_page_view_ = new StartPageView(app_list_main_view, view_delegate);
     AddChildView(start_page_view_);
     view_model_->Add(start_page_view_, kIndexStartPage);
   }
 
-  GetSearchResultListView(view_model_.get())->SetResults(model->results());
+  search_results_view_->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);
   if (apps_container_view_->app_list_folder_view()
           ->items_grid_view()
@@ skipping 10 matching lines @@
 
 void ContentsView::SetShowState(ShowState show_state) {
   if (show_state_ == show_state)
     return;
 
   show_state_ = show_state;
   ShowStateChanged();
 }
 
 void ContentsView::ShowStateChanged() {
-  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();
+  if (show_state_ == SHOW_SEARCH_RESULTS && search_results_view_->visible())
+    search_results_view_->SetSelectedIndex(0);
+  search_results_view_->UpdateAutoLaunchState();
 
   // Notify parent AppListMainView of show state change.
   app_list_main_view_->OnContentsViewShowStateChanged();
 
   if (show_state_ == SHOW_START_PAGE)
-    GetStartPageView(view_model_.get())->Reset();
+    start_page_view_->Reset();
 
   AnimateToIdealBounds();
 }
 
 void ContentsView::CalculateIdealBounds() {
   gfx::Rect rect(GetContentsBounds());
   if (rect.IsEmpty())
     return;
 
   if (app_list::switches::IsExperimentalAppListEnabled()) {
@@ skipping 67 matching lines @@
   apps_container_view_->ShowActiveFolder(item);
 }
 
 void ContentsView::Prerender() {
   const int selected_page =
       std::max(0, GetAppsPaginationModel()->selected_page());
   apps_container_view_->apps_grid_view()->Prerender(selected_page);
 }
 
 gfx::Size ContentsView::GetPreferredSize() const {
-  const gfx::Size container_size = GetAppsContainerView(view_model_.get())->
-      apps_grid_view()->GetPreferredSize();
-  const gfx::Size results_size =
-      GetSearchResultListView(view_model_.get())->GetPreferredSize();
+  const gfx::Size container_size =
+      apps_container_view_->apps_grid_view()->GetPreferredSize();
+  const gfx::Size results_size = search_results_view_->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) {
   switch (show_state_) {
     case SHOW_APPS:
-      return GetAppsContainerView(view_model_.get())->OnKeyPressed(event);
+      return apps_container_view_->OnKeyPressed(event);
     case SHOW_SEARCH_RESULTS:
-      return GetSearchResultListView(view_model_.get())->OnKeyPressed(event);
+      return search_results_view_->OnKeyPressed(event);
     case SHOW_START_PAGE:
-      return GetStartPageView(view_model_.get())->OnKeyPressed(event);
+      return start_page_view_->OnKeyPressed(event);
     default:
       NOTREACHED() << "Unknown show state " << show_state_;
   }
   return false;
 }
 
 bool ContentsView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (show_state_ != SHOW_APPS)
     return false;
 
@@ skipping 64 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