Allow scroll events to open custom launcher pages.

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 "base/strings/utf_string_conversions.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item.h"
 #include "ui/app_list/app_list_model.h"
@@ skipping 214 matching lines @@
 }
 
 void StartPageView::Reset() {
   tiles_container_->Update();
 }
 
 void StartPageView::UpdateForTesting() {
   tiles_container_->Update();
 }
 
+void StartPageView::OpenCustomLauncherPage() {
+  // 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);
+}
+
 const std::vector<SearchResultTileItemView*>& StartPageView::tile_views()
     const {
   return tiles_container_->tile_views();
 }
 
 TileItemView* StartPageView::all_apps_button() const {
   return tiles_container_->all_apps_button();
 }
 
 void StartPageView::OnShow() {
-  UpdateCustomPageClickzoneVisibility();
   tiles_container_->Update();
   tiles_container_->ClearSelectedIndex();
 }
 
-void StartPageView::OnHide() {
-  UpdateCustomPageClickzoneVisibility();
-}
-
 void StartPageView::Layout() {
   gfx::Rect bounds(GetContentsBounds());
   bounds.set_height(instant_container_->GetHeightForWidth(bounds.width()));
   instant_container_->SetBoundsRect(bounds);
 
   // Tiles begin where the instant container ends.
   bounds.set_y(bounds.bottom());
   bounds.set_height(tiles_container_->GetHeightForWidth(bounds.width()));
   tiles_container_->SetBoundsRect(bounds);
 }
@@ skipping 35 matching lines @@
 
   int selection_index = selected_index + dir;
   if (tiles_container_->IsValidSelectionIndex(selection_index)) {
     tiles_container_->SetSelectedIndex(selection_index);
     return true;
   }
 
   return false;
 }
 
+bool StartPageView::OnMousePressed(const ui::MouseEvent& event) {
+  ContentsView* contents_view = app_list_main_view_->contents_view();
+  if (!contents_view->GetCustomPageCollapsedBounds().Contains(event.location()))
+    return false;
+
+  OpenCustomLauncherPage();
+  return true;
+}
+
+bool StartPageView::OnMouseWheel(const ui::MouseWheelEvent& event) {
+  if (event.y_offset() > 0) {

[calamity, 2015/02/12 04:32:24]

I don't know if we want mousewheel/gesture everywhere to show the custom
launcher page..

If we do, we might have to look at filtering the events that go to the start
page web contents to get this working for the areas that it covers.

[tapted, 2015/02/13 04:18:41]

Done.

+    OpenCustomLauncherPage();
+    return true;
+  }
+  return false;
+}
+
+void StartPageView::OnGestureEvent(ui::GestureEvent* event) {
+  if (event->details().scroll_y() > 0)
+    OpenCustomLauncherPage();
+}

[calamity, 2015/02/12 04:32:24]

I think these all need to be gated by

app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone()

since that determines whether the custom page is showable or not.

[tapted, 2015/02/13 04:18:41]

Done.

+
 gfx::Rect StartPageView::GetSearchBoxBounds() const {
   return search_box_spacer_view_->bounds();
 }
 
-void StartPageView::UpdateCustomPageClickzoneVisibility() {
-  // This can get called before InitWidgets(), so we cannot guarantee that
-  // custom_page_clickzone_ will not be null.
-  views::Widget* custom_page_clickzone =
-      app_list_main_view_->GetCustomPageClickzone();
-  if (!custom_page_clickzone)
-    return;
-
-  if (app_list_main_view_->contents_view()->ShouldShowCustomPageClickzone()) {
-    custom_page_clickzone->ShowInactive();
-    return;
-  }
-
-  custom_page_clickzone->Hide();
-}
-
 TileItemView* StartPageView::GetTileItemView(size_t index) {
   return tiles_container_->GetTileItemView(index);
 }
 
 }  // namespace app_list