Revert of Draggable peeking/fullscreen launcher with transparent background.

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 <algorithm>
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/app_list/app_list_constants.h"
-#include "ui/app_list/app_list_features.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
-#include "ui/app_list/app_list_switches.h"
 #include "ui/app_list/app_list_view_delegate.h"
 #include "ui/app_list/search_result.h"
 #include "ui/app_list/views/all_apps_tile_item_view.h"
 #include "ui/app_list/views/app_list_main_view.h"
 #include "ui/app_list/views/contents_view.h"
 #include "ui/app_list/views/custom_launcher_page_view.h"
 #include "ui/app_list/views/search_box_view.h"
 #include "ui/app_list/views/search_result_container_view.h"
 #include "ui/app_list/views/search_result_tile_item_view.h"
 #include "ui/app_list/views/tile_item_view.h"
@@ skipping 17 matching lines @@
 constexpr int kStartPageSearchBoxWidth = 480;
 
 // WebView constants.
 constexpr int kWebViewWidth = 700;
 constexpr int kWebViewHeight = 224;
 
 // Tile container constants.
 constexpr int kTileSpacing = 7;
 constexpr int kNumStartPageTilesCols = 5;
 constexpr int kTilesHorizontalMarginLeft = 145;
-constexpr int kCenterColumnOfStartPageAppGrid = 3;
 
 constexpr int kLauncherPageBackgroundWidth = 400;
 
 }  // namespace
 
 class CustomLauncherPageBackgroundView : public views::View {
  public:
   explicit CustomLauncherPageBackgroundView(
       const std::string& custom_launcher_page_name)
       : selected_(false),
@@ skipping 65 matching lines @@
 StartPageView::StartPageTilesContainer::StartPageTilesContainer(
     ContentsView* contents_view,
     AllAppsTileItemView* all_apps_button,
     AppListViewDelegate* view_delegate)
     : contents_view_(contents_view),
       view_delegate_(view_delegate),
       all_apps_button_(all_apps_button) {
   SetBackground(views::CreateSolidBackground(kLabelBackgroundColor));
   all_apps_button_->SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
   all_apps_button_->SetParentBackgroundColor(kLabelBackgroundColor);
-
-  CreateAppsGrid(features::IsFullscreenAppListEnabled()
-                     ? kNumStartPageTilesFullscreen
-                     : kNumStartPageTiles);
+  CreateAppsGrid(kNumStartPageTiles);
 }
 
 StartPageView::StartPageTilesContainer::~StartPageTilesContainer() {
 }
 
 TileItemView* StartPageView::StartPageTilesContainer::GetTileItemView(
     int index) {
   DCHECK_GT(num_results(), index);
   if (index == num_results() - 1)
     return all_apps_button_;
@@ skipping 13 matching lines @@
 
   std::vector<SearchResult*> display_results =
       AppListModel::FilterSearchResultsByDisplayType(
           results(), SearchResult::DISPLAY_RECOMMENDATION, kNumStartPageTiles);
   if (display_results.size() != search_result_tile_views_.size()) {
     // We should recreate the grid layout in this case.
     for (size_t i = 0; i < search_result_tile_views_.size(); ++i)
       delete search_result_tile_views_[i];
     search_result_tile_views_.clear();
     RemoveChildView(all_apps_button_);
-
-    CreateAppsGrid(features::IsFullscreenAppListEnabled()
-                       ? kNumStartPageTilesFullscreen
-                       : std::min(kNumStartPageTiles, display_results.size()));
+    CreateAppsGrid(std::min(kNumStartPageTiles, display_results.size()));
   }
 
   // Update the tile item results.
   for (size_t i = 0; i < search_result_tile_views_.size(); ++i) {
     SearchResult* item = nullptr;
     if (i < display_results.size())
       item = display_results[i];
     search_result_tile_views_[i]->SetSearchResult(item);
     search_result_tile_views_[i]->SetEnabled(true);
   }
@@ skipping 50 matching lines @@
         new SearchResultTileItemView(this, view_delegate_);
     if (i % kNumStartPageTilesCols == 0)
       tiles_layout_manager->StartRow(0, 0);
     tiles_layout_manager->AddView(tile_item);
     AddChildView(tile_item);
     tile_item->SetParentBackgroundColor(kLabelBackgroundColor);
     tile_item->SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
     search_result_tile_views_.emplace_back(tile_item);
   }
 
+  // Also add a special "all apps" button to the end of the container.
   all_apps_button_->UpdateIcon();
-  if (features::IsFullscreenAppListEnabled()) {
-    // Also add a special "all apps" button to the middle of the next row of the
-    // container.
+  if (i % kNumStartPageTilesCols == 0)
     tiles_layout_manager->StartRow(0, 0);
-    tiles_layout_manager->SkipColumns(kCenterColumnOfStartPageAppGrid);
-  } else {
-    // Also add a special "all apps" button to the end of the next row of the
-    // container.
-    if (i % kNumStartPageTilesCols == 0)
-      tiles_layout_manager->StartRow(0, 0);
-  }
-
   tiles_layout_manager->AddView(all_apps_button_);
   AddChildView(all_apps_button_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // StartPageView implementation:
 StartPageView::StartPageView(AppListMainView* app_list_main_view,
-                             AppListViewDelegate* view_delegate,
-                             AppListView* app_list_view)
+                             AppListViewDelegate* view_delegate)
     : app_list_main_view_(app_list_main_view),
       view_delegate_(view_delegate),
       search_box_spacer_view_(new View()),
       instant_container_(new views::View),
       custom_launcher_page_background_(new CustomLauncherPageBackgroundView(
           view_delegate_->GetModel()->custom_launcher_page_name())),
       tiles_container_(new StartPageTilesContainer(
           app_list_main_view->contents_view(),
-          new AllAppsTileItemView(app_list_main_view_->contents_view(),
-                                  app_list_view),
+          new AllAppsTileItemView(app_list_main_view_->contents_view()),
           view_delegate)) {
   search_box_spacer_view_->SetPreferredSize(gfx::Size(
       kStartPageSearchBoxWidth,
       app_list_main_view->search_box_view()->GetPreferredSize().height()));
 
   // The view containing the start page WebContents and SearchBoxSpacerView.
   InitInstantContainer();
   AddChildView(instant_container_);
 
   // The view containing the start page tiles.
   AddChildView(tiles_container_);
+
   AddChildView(custom_launcher_page_background_);
 
   tiles_container_->SetResults(view_delegate_->GetModel()->results());
 }
 
 StartPageView::~StartPageView() {
 }
 
 void StartPageView::InitInstantContainer() {
   views::BoxLayout* instant_layout_manager = new views::BoxLayout(
       views::BoxLayout::kVertical, gfx::Insets(), kInstantContainerSpacing);
   instant_layout_manager->set_inside_border_insets(
       gfx::Insets(0, 0, kSearchBoxAndTilesSpacing, 0));
   instant_layout_manager->set_main_axis_alignment(
       views::BoxLayout::MAIN_AXIS_ALIGNMENT_END);
   instant_layout_manager->set_cross_axis_alignment(
       views::BoxLayout::CROSS_AXIS_ALIGNMENT_CENTER);
   instant_container_->SetLayoutManager(instant_layout_manager);
 
-  // Create the view for the Google Doodle if the fullscreen launcher is not
-  // enabled.
-  if (!features::IsFullscreenAppListEnabled()) {
-    views::View* web_view = view_delegate_->CreateStartPageWebView(
-        gfx::Size(kWebViewWidth, kWebViewHeight));
-
-    if (web_view) {
-      web_view->SetFocusBehavior(FocusBehavior::NEVER);
-      instant_container_->AddChildView(web_view);
-    }
+  views::View* web_view = view_delegate_->CreateStartPageWebView(
+      gfx::Size(kWebViewWidth, kWebViewHeight));
+  if (web_view) {
+    web_view->SetFocusBehavior(FocusBehavior::NEVER);
+    instant_container_->AddChildView(web_view);
   }
 
   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;
@@ skipping 198 matching lines @@
   // is enabled).
   if (event->type() == ui::ET_SCROLL && event->y_offset() < 0)
     MaybeOpenCustomLauncherPage();
 }
 
 TileItemView* StartPageView::GetTileItemView(size_t index) {
   return tiles_container_->GetTileItemView(index);
 }
 
 }  // namespace app_list