Remove duplicate launcher page switching logic in AppListMainView.

ui/app_list/views/app_list_main_view.cc

 // Copyright 2013 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_main_view.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 233 matching lines @@
     parent()->SchedulePaint();
 }
 
 bool AppListMainView::ShouldShowCustomLauncherPage() const {
   return contents_view_->custom_page_view() &&
          model_->custom_launcher_page_enabled() &&
          model_->search_engine_is_google();
 }
 
 void AppListMainView::UpdateCustomLauncherPageVisibility() {
-  if (ShouldShowCustomLauncherPage()) {
-    // Make the custom page view visible again.
-    contents_view_->custom_page_view()->SetVisible(true);
-  } else if (contents_view_->IsStateActive(
-                 AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)) {
-    // Animate to the start page if currently on the custom page view. The view
-    // will hide on animation completion.
-    contents_view_->SetActivePage(
-        contents_view_->GetPageIndexForState(AppListModel::STATE_START));
-  } else {
-    // Hide the view immediately otherwise.
-    contents_view_->custom_page_view()->SetVisible(false);
-  }
-}
-
-void AppListMainView::OnCustomLauncherPageEnabledStateChanged(bool enabled) {
   views::View* custom_page = contents_view_->custom_page_view();
   if (!custom_page)
     return;
 
   if (ShouldShowCustomLauncherPage()) {
     // Make the custom page view visible again.
     custom_page->SetVisible(true);
   } else if (contents_view_->IsStateActive(
                  AppListModel::STATE_CUSTOM_LAUNCHER_PAGE)) {
     // Animate to the start page if currently on the custom page view. The view
     // will hide on animation completion.
     contents_view_->SetActivePage(
         contents_view_->GetPageIndexForState(AppListModel::STATE_START));
   } else {
     // Hide the view immediately otherwise.
     custom_page->SetVisible(false);
   }
 }
 
+void AppListMainView::OnCustomLauncherPageEnabledStateChanged(bool enabled) {
+  UpdateCustomLauncherPageVisibility();
+}
+
 void AppListMainView::OnSearchEngineIsGoogleChanged(bool is_google) {
   if (contents_view_->custom_page_view())
-    OnCustomLauncherPageEnabledStateChanged(is_google);
+    UpdateCustomLauncherPageVisibility();
 
   if (contents_view_->start_page_view()) {
     contents_view_->start_page_view()->instant_container()->SetVisible(
         is_google);
   }
 }
 
 void AppListMainView::ActivateApp(AppListItem* item, int event_flags) {
   // TODO(jennyz): Activate the folder via AppListModel notification.
   if (item->GetItemType() == AppListFolderItem::kItemType)
@@ skipping 33 matching lines @@
     contents_view_->search_results_page_view()->SetSelection(select);
 }
 
 void AppListMainView::OnResultInstalled(SearchResult* result) {
   // Clears the search to show the apps grid. The last installed app
   // should be highlighted and made visible already.
   search_box_view_->ClearSearch();
 }
 
 }  // namespace app_list