Change ContentsView::SetActivePage to use States rather than indexes.

ui/app_list/views/start_page_view.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/start_page_view.h"
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item.h"
@@ skipping 213 matching lines @@
 
   instant_container_->AddChildView(search_box_spacer_view_);
 }
 
 void StartPageView::MaybeOpenCustomLauncherPage() {
   // Switch to the custom page.
   ContentsView* contents_view = app_list_main_view_->contents_view();
   if (!app_list_main_view_->ShouldShowCustomLauncherPage())
     return;
 
-  int custom_page_index = contents_view->GetPageIndexForState(
-      AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
-  contents_view->SetActivePage(custom_page_index);
+  contents_view->SetActivePage(AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
 }
 
 void StartPageView::Reset() {
   tiles_container_->Update();
 }
 
 void StartPageView::UpdateForTesting() {
   tiles_container_->Update();
 }
 
@@ skipping 109 matching lines @@
 
 gfx::Rect StartPageView::GetSearchBoxBounds() const {
   return search_box_spacer_view_->bounds();
 }
 
 TileItemView* StartPageView::GetTileItemView(size_t index) {
   return tiles_container_->GetTileItemView(index);
 }
 
 }  // namespace app_list