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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 return kViewClassName; | 71 return kViewClassName; |
72 } | 72 } |
73 | 73 |
74 // Overridden from View for keyboard UI. | 74 // Overridden from View for keyboard UI. |
75 bool NativeScrollBar::OnKeyPressed(const ui::KeyEvent& event) { | 75 bool NativeScrollBar::OnKeyPressed(const ui::KeyEvent& event) { |
76 if (!native_wrapper_) | 76 if (!native_wrapper_) |
77 return false; | 77 return false; |
78 return native_wrapper_->GetView()->OnKeyPressed(event); | 78 return native_wrapper_->GetView()->OnKeyPressed(event); |
79 } | 79 } |
80 | 80 |
81 ui::EventResult NativeScrollBar::OnGestureEvent(ui::GestureEvent* event) { | 81 void NativeScrollBar::OnGestureEvent(ui::GestureEvent* event) { |
82 if (!native_wrapper_) | 82 if (!native_wrapper_) |
83 return ui::ER_UNHANDLED; | 83 return; |
84 return native_wrapper_->GetView()->OnGestureEvent(event); | 84 native_wrapper_->GetView()->OnGestureEvent(event); |
85 } | 85 } |
86 | 86 |
87 bool NativeScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) { | 87 bool NativeScrollBar::OnMouseWheel(const ui::MouseWheelEvent& event) { |
88 if (!native_wrapper_) | 88 if (!native_wrapper_) |
89 return false; | 89 return false; |
90 return native_wrapper_->GetView()->OnMouseWheel(event); | 90 return native_wrapper_->GetView()->OnMouseWheel(event); |
91 } | 91 } |
92 | 92 |
93 //////////////////////////////////////////////////////////////////////////////// | 93 //////////////////////////////////////////////////////////////////////////////// |
94 // NativeScrollBar, ScrollBar overrides: | 94 // NativeScrollBar, ScrollBar overrides: |
(...skipping 13 matching lines...) Expand all Loading... |
108 } | 108 } |
109 | 109 |
110 int NativeScrollBar::GetPosition() const { | 110 int NativeScrollBar::GetPosition() const { |
111 if (!native_wrapper_) | 111 if (!native_wrapper_) |
112 return 0; | 112 return 0; |
113 return native_wrapper_->GetPosition(); | 113 return native_wrapper_->GetPosition(); |
114 } | 114 } |
115 | 115 |
116 } // namespace views | 116 } // namespace views |
117 | 117 |
OLD | NEW |