| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/scrollbar/native_scroll_bar.h" | 5 #include "ui/views/controls/scrollbar/native_scroll_bar.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 return kViewClassName; | 69 return kViewClassName; |
| 70 } | 70 } |
| 71 | 71 |
| 72 // Overridden from View for keyboard UI. | 72 // Overridden from View for keyboard UI. |
| 73 bool NativeScrollBar::OnKeyPressed(const ui::KeyEvent& event) { | 73 bool NativeScrollBar::OnKeyPressed(const ui::KeyEvent& event) { |
| 74 if (!native_wrapper_) | 74 if (!native_wrapper_) |
| 75 return false; | 75 return false; |
| 76 return native_wrapper_->GetView()->OnKeyPressed(event); | 76 return native_wrapper_->GetView()->OnKeyPressed(event); |
| 77 } | 77 } |
| 78 | 78 |
| 79 ui::GestureStatus NativeScrollBar::OnGestureEvent( | 79 ui::EventResult NativeScrollBar::OnGestureEvent( |
| 80 const ui::GestureEvent& event) { | 80 const ui::GestureEvent& event) { |
| 81 if (!native_wrapper_) | 81 if (!native_wrapper_) |
| 82 return ui::GESTURE_STATUS_UNKNOWN; | 82 return ui::ER_UNHANDLED; |
| 83 return native_wrapper_->GetView()->OnGestureEvent(event); | 83 return native_wrapper_->GetView()->OnGestureEvent(event); |
| 84 } | 84 } |
| 85 | 85 |
| 86 bool NativeScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) { | 86 bool NativeScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) { |
| 87 if (!native_wrapper_) | 87 if (!native_wrapper_) |
| 88 return false; | 88 return false; |
| 89 return native_wrapper_->GetView()->OnMouseWheel(event); | 89 return native_wrapper_->GetView()->OnMouseWheel(event); |
| 90 } | 90 } |
| 91 | 91 |
| 92 //////////////////////////////////////////////////////////////////////////////// | 92 //////////////////////////////////////////////////////////////////////////////// |
| (...skipping 13 matching lines...) Expand all Loading... |
| 106 } | 106 } |
| 107 | 107 |
| 108 int NativeScrollBar::GetPosition() const { | 108 int NativeScrollBar::GetPosition() const { |
| 109 if (!native_wrapper_) | 109 if (!native_wrapper_) |
| 110 return 0; | 110 return 0; |
| 111 return native_wrapper_->GetPosition(); | 111 return native_wrapper_->GetPosition(); |
| 112 } | 112 } |
| 113 | 113 |
| 114 } // namespace views | 114 } // namespace views |
| 115 | 115 |
| OLD | NEW |