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

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 118 matching lines @@
   search_box_view_ = search_box_view;
   AddContentsViews();
 
   // Switch the apps grid view to the specified page.
   app_list::PaginationModel* pagination_model = GetAppsPaginationModel();
   if (pagination_model->is_valid_page(initial_apps_page))
     pagination_model->SelectPage(initial_apps_page, false);
 
   // Starts icon loading early.
   PreloadIcons(parent);
+
+  OnSearchEngineIsGoogleChanged(model_->search_engine_is_google());
 }
 
 void AppListMainView::AddContentsViews() {
   DCHECK(search_box_view_);
 
   contents_view_ = new ContentsView(this);
   contents_view_->Init(model_);
   AddChildView(contents_view_);
 
   search_box_view_->set_contents_view(contents_view_);
@@ skipping 152 matching lines @@
 
   // Create a widget for the custom page click zone. This widget masks click
   // events from the WebContents that rests underneath it. (It has to be a
   // widget, not an ordinary view, so that it can be placed in front of the
   // WebContents.)
   custom_page_clickzone_ = new views::Widget;
   custom_page_clickzone_->Init(custom_page_clickzone_params);
   custom_page_clickzone_->SetContentsView(new CustomPageButton(this));
   // The widget is shown by default. If the ContentsView determines that we do
   // not need a clickzone upon startup, hide it.
-  if (!contents_view_->ShouldShowCustomPageClickzone())
+  if (!ShouldShowCustomLauncherPage() ||
+      !contents_view_->IsStateActive(AppListModel::STATE_START))
     custom_page_clickzone_->Hide();
 }
 
+bool AppListMainView::ShouldShowCustomLauncherPage() const {
+  return contents_view_->custom_page_view() &&
+         model_->custom_launcher_page_enabled() &&
+         model_->search_engine_is_google();

[Matt Giuca, 2015/02/17 00:23:34]

You're adding this behaviour here, right? (Not just refactoring it.) If so, you
should update the CL description to reflect that you are disabling the CLP as
well as the doodle.

[calamity, 2015/02/17 06:16:37]

Done.

+}
+
+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) {
   if (enabled) {
     // 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);
   }
   // Allow the start page to update |custom_page_clickzone_|.
   contents_view_->start_page_view()->UpdateCustomPageClickzoneVisibility();
 }
 
+void AppListMainView::OnSearchEngineIsGoogleChanged(bool is_google) {
+  if (contents_view_->custom_page_view()) {
+    contents_view_->custom_page_view()->SetVisible(is_google);
+    contents_view_->start_page_view()->instant_container()->SetVisible(
+        is_google);
+    contents_view_->start_page_view()->UpdateCustomPageClickzoneVisibility();
+  }
+}
+
 void AppListMainView::ActivateApp(AppListItem* item, int event_flags) {
   // TODO(jennyz): Activate the folder via AppListModel notification.
   if (item->GetItemType() == AppListFolderItem::kItemType)
     contents_view_->ShowFolderContent(static_cast<AppListFolderItem*>(item));
   else
     item->Activate(event_flags);
 }
 
 void AppListMainView::GetShortcutPathForApp(
     const std::string& app_id,
@@ skipping 21 matching lines @@
   contents_view_->Back();
 }
 
 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