Fix overlay scrollbar's response to gesture events.

ui/views/controls/scrollbar/overlay_scroll_bar.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/views/controls/scrollbar/overlay_scroll_bar.h"
 
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkXfermode.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 44 matching lines @@
 OverlayScrollBarThumb::~OverlayScrollBarThumb() {
 }
 
 gfx::Size OverlayScrollBarThumb::GetPreferredSize() {
   return gfx::Size(kThumbMinimumSize, kThumbMinimumSize);
 }
 
 void OverlayScrollBarThumb::OnPaint(gfx::Canvas* canvas) {
   gfx::Rect local_bounds(GetLocalBounds());
   SkPaint paint;
-  int alpha = (GetState() == CustomButton::STATE_HOVERED ||
-               GetState() == CustomButton::STATE_PRESSED) ?
-      kThumbHoverAlpha : kThumbDefaultAlpha;
-  alpha *= animation_opacity_;
+  int alpha = kThumbDefaultAlpha * animation_opacity_;
+  if (GetState() == CustomButton::STATE_HOVERED) {
+    alpha = kThumbHoverAlpha * animation_opacity_;
+  } else if(GetState() == CustomButton::STATE_PRESSED) {
+    // If we are in pressed state, no need to worry about animation,
+    // just display the deeper color.
+    alpha = kThumbHoverAlpha;
+  }
+
   paint.setStyle(SkPaint::kFill_Style);
   paint.setColor(SkColorSetARGB(alpha, 0, 0, 0));
   canvas->DrawRoundRect(local_bounds, kThumbCornerRadius, paint);
 }
 
 void OverlayScrollBarThumb::AnimationProgressed(
     const ui::Animation* animation) {
   animation_opacity_ = animation->GetCurrentValue();
   SchedulePaint();
 }
@@ skipping 33 matching lines @@
 }
 
 void OverlayScrollBar::OnMouseEnteredScrollView(const ui::MouseEvent& event) {
   animation_.Show();
 }
 
 void OverlayScrollBar::OnMouseExitedScrollView(const ui::MouseEvent& event) {
   animation_.Hide();
 }
 
+void OverlayScrollBar::OnGestureEvent(ui::GestureEvent* event) {
+  switch (event->type()) {
+    case ui::ET_GESTURE_SCROLL_BEGIN:
+      animation_.Show();
+      break;
+    case ui::ET_GESTURE_SCROLL_END:
+    case ui::ET_SCROLL_FLING_START:
+    case ui::ET_GESTURE_END:
+      animation_.Hide();
+      break;
+    default:
+      break;
+  }
+  BaseScrollBar::OnGestureEvent(event);
+}
+
 gfx::Size OverlayScrollBar::GetPreferredSize() {
   return gfx::Size();
 }
 
 void OverlayScrollBar::Layout() {
   gfx::Rect thumb_bounds = GetTrackBounds();
   BaseScrollBarThumb* thumb = GetThumb();
   if (IsHorizontal()) {
     thumb_bounds.set_x(thumb->x());
     thumb_bounds.set_width(thumb->width());
   } else {
     thumb_bounds.set_y(thumb->y());
     thumb_bounds.set_height(thumb->height());
   }
   thumb->SetBoundsRect(thumb_bounds);
 }
 
 void OverlayScrollBar::OnPaint(gfx::Canvas* canvas) {
 }
 
 }  // namespace views