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

ui/app_list/views/contents_view.cc

Index: ui/app_list/views/contents_view.cc
diff --git a/ui/app_list/views/contents_view.cc b/ui/app_list/views/contents_view.cc
index 2fdbd559f5e1864679e8b71269503f5754446a40..317b79fb650231f6b172075f38f8ff70322922f2 100644
--- a/ui/app_list/views/contents_view.cc
+++ b/ui/app_list/views/contents_view.cc
@@ -183,6 +183,9 @@ int ContentsView::NumLauncherPages() const {
 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.
@@ -414,11 +417,6 @@ gfx::Rect ContentsView::GetCustomPageCollapsedBounds() const {
   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) {
@@ -528,7 +526,7 @@ void ContentsView::SelectedPageChanged(int old_selected, int new_selected) {
     // 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());
     }
   } else {
     start_page_view_->OnHide();