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 206 matching lines @@
   views::View* web_view = view_delegate_->CreateStartPageWebView(
       gfx::Size(kWebViewWidth, kWebViewHeight));
   if (web_view) {
     web_view->SetFocusable(false);
     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 (!contents_view->ShouldShowCustomPageClickzone())

[calamity, 2015/02/17 00:54:09]

This ought to get a rename. I'll do it in my CL that goes on top of this.

[tapted, 2015/02/17 03:06:01]

Acknowledged.

+    return;
+
+  int custom_page_index = contents_view->GetPageIndexForState(
+      AppListModel::STATE_CUSTOM_LAUNCHER_PAGE);
+  contents_view->SetActivePage(custom_page_index);
+}
+
 void StartPageView::Reset() {
   tiles_container_->Update();
 }
 
 void StartPageView::UpdateForTesting() {
   tiles_container_->Update();
 }
 
 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;
+
+  MaybeOpenCustomLauncherPage();
+  return true;
+}
+
+bool StartPageView::OnMouseWheel(const ui::MouseWheelEvent& event) {
+  if (event.y_offset() > 0) {
+    MaybeOpenCustomLauncherPage();
+    return true;
+  }

[calamity, 2015/02/17 00:54:09]

nit: newline after early return

[tapted, 2015/02/17 03:06:01]

Done.

+  return false;
+}
+
+void StartPageView::OnGestureEvent(ui::GestureEvent* event) {
+  if (event->type() == ui::ET_GESTURE_SCROLL_BEGIN &&
+      event->details().scroll_y_hint() < 0)
+    MaybeOpenCustomLauncherPage();
+
+  ContentsView* contents_view = app_list_main_view_->contents_view();
+  if (event->type() == ui::ET_GESTURE_TAP &&
+      contents_view->GetCustomPageCollapsedBounds().Contains(event->location()))
+    MaybeOpenCustomLauncherPage();
+}
+
+void StartPageView::OnScrollEvent(ui::ScrollEvent* event) {
+  if (event->type() == ui::ET_SCROLL && event->y_offset() > 0)
+    MaybeOpenCustomLauncherPage();
+}
+
 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