Modify the pure-views slider to reset on ESC.

ui/views/controls/slider.cc

Index: ui/views/controls/slider.cc
diff --git a/ui/views/controls/slider.cc b/ui/views/controls/slider.cc
index 1f396c349120bf1e88363de7377221b90c014fec..db487c73993126048f357f4d2bc31e464e054c4f 100644
--- a/ui/views/controls/slider.cc
+++ b/ui/views/controls/slider.cc
@@ -11,6 +11,7 @@
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
+#include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
@@ -30,7 +31,8 @@ Slider::Slider(SliderListener* listener, Orientation orientation)
       value_(0.f),
       keyboard_increment_(0.1f),
       animating_value_(0.f),
-      value_is_valid_(false) {
+      value_is_valid_(false),
+      esc_was_pressed_(false) {
   EnableCanvasFlippingForRTLUI(true);
   set_focusable(true);
 }
@@ -145,10 +147,15 @@ void Slider::OnPaint(gfx::Canvas* canvas) {
 bool Slider::OnMousePressed(const views::MouseEvent& event) {
   if (listener_)
     listener_->SliderDragStarted(this);
+  original_value_ = value_;
+  ui::Accelerator escape_accelerator(ui::VKEY_ESCAPE, false, false, false);
+  AddAccelerator(escape_accelerator);
   return OnMouseDragged(event);
 }
 
 bool Slider::OnMouseDragged(const views::MouseEvent& event) {
+  if (esc_was_pressed_)
+    return true;
   gfx::Insets inset = GetInsets();
   if (orientation_ == HORIZONTAL) {
     int amount = base::i18n::IsRTL() ? width() - inset.left() - event.x() :
@@ -165,6 +172,8 @@ bool Slider::OnMouseDragged(const views::MouseEvent& event) {
 void Slider::OnMouseReleased(const views::MouseEvent& event) {
   if (listener_)
     listener_->SliderDragEnded(this);
+  esc_was_pressed_ = false;
+  ResetAccelerators();
 }
 
 bool Slider::OnKeyPressed(const views::KeyEvent& event) {
@@ -200,4 +209,10 @@ void Slider::GetAccessibleState(ui::AccessibleViewState* state) {
       base::StringPrintf("%d%%", (int)(value_ * 100 + 0.5)));
 }
 
+bool Slider::AcceleratorPressed(const ui::Accelerator& accelerator) {
+  SetValueInternal(original_value_, VALUE_CHANGED_BY_USER);
+  esc_was_pressed_ = true;
+  return true;
+}
+
 }  // namespace views