Allow scroll events to open custom launcher pages.

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 24 matching lines @@
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
 
 namespace app_list {
 
 namespace {
 
 // The maximum allowed time to wait for icon loading in milliseconds.
 const int kMaxIconLoadingWaitTimeInMs = 50;
 
-// Button for the custom page click zone. Receives click events when the user
-// clicks on the custom page, and in response, switches to the custom page.
-class CustomPageButton : public views::CustomButton,
-                         public views::ButtonListener {
- public:
-  explicit CustomPageButton(AppListMainView* app_list_main_view);
-
-  // ButtonListener overrides:
-  void ButtonPressed(views::Button* sender, const ui::Event& event) override;
-
- private:
-  AppListMainView* app_list_main_view_;
-
-  DISALLOW_COPY_AND_ASSIGN(CustomPageButton);
-};
-
-CustomPageButton::CustomPageButton(AppListMainView* app_list_main_view)
-    : views::CustomButton(this), app_list_main_view_(app_list_main_view) {
-}
-
-void CustomPageButton::ButtonPressed(views::Button* sender,
-                                     const ui::Event& event) {
-  // Switch to the custom page.
-  ContentsView* contents_view = app_list_main_view_->contents_view();
-  int custom_page_index = contents_view->GetPageIndexForState(
-      AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
-  contents_view->SetActivePage(custom_page_index);
-}
-
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListMainView::IconLoader
 
 class AppListMainView::IconLoader : public AppListItemObserver {
  public:
   IconLoader(AppListMainView* owner,
              AppListItem* item,
              float scale)
@@ skipping 21 matching lines @@
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // AppListMainView:
 
 AppListMainView::AppListMainView(AppListViewDelegate* delegate)
     : delegate_(delegate),
       model_(delegate->GetModel()),
       search_box_view_(nullptr),
       contents_view_(nullptr),
-      custom_page_clickzone_(nullptr),
       weak_ptr_factory_(this) {
   SetLayoutManager(new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   model_->AddObserver(this);
 }
 
 AppListMainView::~AppListMainView() {
   pending_icon_loaders_.clear();
   model_->RemoveObserver(this);
 }
 
@@ skipping 69 matching lines @@
   model_->RemoveObserver(this);
   model_ = delegate_->GetModel();
   model_->AddObserver(this);
   search_box_view_->ModelChanged();
   delete contents_view_;
   contents_view_ = NULL;
   AddContentsViews();
   Layout();
 }
 
-views::Widget* AppListMainView::GetCustomPageClickzone() const {
-  // During shutdown, the widgets may be deleted, which means
-  // |custom_page_clickzone_| will be a dangling pointer. Therefore, always
-  // check that the main app list widget (its parent) is still alive before
-  // returning the pointer.
-  if (!GetWidget())
-    return nullptr;
-
-  return custom_page_clickzone_;
-}
-
 void AppListMainView::SetDragAndDropHostOfCurrentAppList(
     ApplicationDragAndDropHost* drag_and_drop_host) {
   contents_view_->SetDragAndDropHostOfCurrentAppList(drag_and_drop_host);
 }
 
 bool AppListMainView::ShouldCenterWindow() const {
   return delegate_->ShouldCenterWindow();
 }
 
 PaginationModel* AppListMainView::GetAppsPaginationModel() {
@@ skipping 49 matching lines @@
 }
 
 void AppListMainView::NotifySearchBoxVisibilityChanged() {
   // Repaint the AppListView's background which will repaint the background for
   // the search box. This is needed because this view paints to a layer and
   // won't propagate paints upward.
   if (parent())
     parent()->SchedulePaint();
 }
 
-void AppListMainView::InitWidgets() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/431326 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION("431326 AppListMainView::InitWidgets"));
-
-  // The widget that receives click events to transition to the custom page.
-  views::Widget::InitParams custom_page_clickzone_params(
-      views::Widget::InitParams::TYPE_CONTROL);
-
-  custom_page_clickzone_params.parent = GetWidget()->GetNativeView();
-  custom_page_clickzone_params.layer_type = aura::WINDOW_LAYER_NOT_DRAWN;
-
-  gfx::Rect custom_page_bounds = contents_view_->GetCustomPageCollapsedBounds();
-  custom_page_bounds.Intersect(contents_view_->bounds());
-  custom_page_bounds = contents_view_->ConvertRectToWidget(custom_page_bounds);
-  custom_page_clickzone_params.bounds = custom_page_bounds;
-
-  // 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())
-    custom_page_clickzone_->Hide();
-}
-
 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::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);
 }
 
@@ skipping 23 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