Hide experimental app list Google logo and custom launcher page when search engine is not Google.

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 <vector>
 
 #include "base/logging.h"
@@ skipping 165 matching lines @@
   return it->second;
 }
 
 int ContentsView::NumLauncherPages() const {
   return pagination_model_.total_pages();
 }
 
 void ContentsView::SetActivePageInternal(int page_index,
                                          bool show_search_results,
                                          bool animate) {
+  if (!GetPageView(page_index)->visible())
+    return;
+
   if (!show_search_results)
     page_before_search_ = page_index;
   // Start animating to the new page.
   pagination_model_.SelectPage(page_index, animate);
   ActivePageChanged();
 
   if (!animate)
     Layout();
 }
 
@@ skipping 211 matching lines @@
   return bounds;
 }
 
 gfx::Rect ContentsView::GetCustomPageCollapsedBounds() const {
   gfx::Rect bounds(GetContentsBounds());
   int page_height = bounds.height();
   bounds.set_y(page_height - kCustomPageCollapsedHeight);
   return bounds;
 }
 
-bool ContentsView::ShouldShowCustomPageClickzone() const {
-  return custom_page_view_ && IsStateActive(AppListModel::STATE_START) &&
-         app_list_main_view_->model()->custom_launcher_page_enabled();
-}
-
 bool ContentsView::Back() {
   AppListModel::State state = view_to_state_[GetActivePageIndex()];
   switch (state) {
     case AppListModel::STATE_START:
       // Close the app list when Back() is called from the start page.
       return false;
     case AppListModel::STATE_CUSTOM_LAUNCHER_PAGE:
       if (app_list_main_view_->model()->PopCustomLauncherPageSubpage())
         app_list_main_view_->view_delegate()->CustomLauncherPagePopSubpage();
       else
@@ skipping 89 matching lines @@
   // TODO(mgiuca): This should be generalized so we call a virtual OnShow and
   // OnHide method for each page.
   if (!start_page_view_)
     return;
 
   if (new_selected == GetPageIndexForState(AppListModel::STATE_START)) {
     start_page_view_->OnShow();
     // Show or hide the custom page view, based on whether it is enabled.
     if (custom_page_view_) {
       custom_page_view_->SetVisible(
-          app_list_main_view_->model()->custom_launcher_page_enabled());
+          app_list_main_view_->ShouldShowCustomLauncherPage());
     }
   }
 }
 
 void ContentsView::TransitionStarted() {
 }
 
 void ContentsView::TransitionChanged() {
   UpdatePageBounds();
 }
 
 }  // namespace app_list