New AppListView Scroll Behavior.

ui/app_list/views/search_box_view.cc

 // Copyright (c) 2012 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/search_box_view.h"
 
 #include <algorithm>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 363 matching lines @@
   search_box_->set_placeholder_text_color(active ? kZeroQuerySearchboxColor
                                                  : kDefaultSearchboxColor);
   search_box_->SetCursorEnabled(active);
   search_box_->SchedulePaint();
 }
 
 void SearchBoxView::HandleSearchBoxEvent(ui::LocatedEvent* located_event) {
   if (!is_fullscreen_app_list_enabled_)
     return;
 
-  if (located_event->type() != ui::ET_MOUSE_PRESSED &&
-      located_event->type() != ui::ET_GESTURE_TAP)
-    return;
+  if (located_event->type() == ui::ET_MOUSEWHEEL) {
+    if (!app_list_view_->HandleScroll(located_event))
+      return;
 
-  bool event_is_in_searchbox_bounds =
-      GetWidget()->GetWindowBoundsInScreen().Contains(
-          located_event->root_location());
-
-  if (!is_search_box_active_ && event_is_in_searchbox_bounds &&
-      search_box_->text().empty()) {
+  } else if (located_event->type() == ui::ET_MOUSE_PRESSED ||
+             located_event->type() == ui::ET_GESTURE_TAP) {
+    bool event_is_in_searchbox_bounds =
+        GetWidget()->GetWindowBoundsInScreen().Contains(
+            located_event->root_location());
+    if (is_search_box_active_ || !event_is_in_searchbox_bounds ||
+        !search_box_->text().empty())
+      return;
     // If the event was within the searchbox bounds and in an inactive empty
     // search box, enable the search box.
     SetSearchBoxActive(true);
-    located_event->SetHandled();
   }
+  located_event->SetHandled();
 }
 
 bool SearchBoxView::OnTextfieldEvent() {
   if (!is_fullscreen_app_list_enabled_)
     return false;
 
   if (is_search_box_active_)
     return false;
 
   SetSearchBoxActive(true);
   return true;
 }
 
 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
   if (contents_view_)
     return contents_view_->OnMouseWheel(event);
-
   return false;
 }
 
 void SearchBoxView::OnEnabledChanged() {
   search_box_->SetEnabled(enabled());
   if (speech_button_)
     speech_button_->SetEnabled(enabled());
 }
 
 const char* SearchBoxView::GetClassName() const {
   return "SearchBoxView";
 }
 
 void SearchBoxView::OnGestureEvent(ui::GestureEvent* event) {
+  if (!is_fullscreen_app_list_enabled_)
+    return;
+
   HandleSearchBoxEvent(event);
 }
 
 void SearchBoxView::OnMouseEvent(ui::MouseEvent* event) {
   HandleSearchBoxEvent(event);
 }
 
 void SearchBoxView::UpdateModel() {
   // Temporarily remove from observer to ignore notifications caused by us.
   model_->search_box()->RemoveObserver(this);
@@ skipping 65 matching lines @@
 
     return contents_view_ && contents_view_->visible() &&
            contents_view_->OnKeyReleased(key_event);
   }
 
   return false;
 }
 
 bool SearchBoxView::HandleMouseEvent(views::Textfield* sender,
                                      const ui::MouseEvent& mouse_event) {
-  return OnTextfieldEvent();
+  if (!is_fullscreen_app_list_enabled_)
+    return false;
+
+  if (mouse_event.type() == ui::ET_MOUSEWHEEL) {
+    return app_list_view_->HandleScroll(&mouse_event);
+  } else {
+    return OnTextfieldEvent();
+  }
 }
 
 bool SearchBoxView::HandleGestureEvent(views::Textfield* sender,
                                        const ui::GestureEvent& gesture_event) {
   return OnTextfieldEvent();
 }
 
 void SearchBoxView::ButtonPressed(views::Button* sender,
                                   const ui::Event& event) {
   if (back_button_ && sender == back_button_)
@@ skipping 101 matching lines @@
   SchedulePaint();
 }
 
 void SearchBoxView::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   SpeechRecognitionButtonPropChanged();
   SchedulePaint();
 }
 
 }  // namespace app_list