| 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/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| 11 #include "ui/events/event.h" | 11 #include "ui/events/event.h" |
| 12 #include "ui/views/controls/scrollbar/native_scroll_bar_views.h" |
| 12 #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h" | 13 #include "ui/views/controls/scrollbar/native_scroll_bar_wrapper.h" |
| 13 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
| 14 | 15 |
| 15 #if defined(USE_AURA) | |
| 16 #include "ui/views/controls/scrollbar/native_scroll_bar_views.h" | |
| 17 #endif | |
| 18 | |
| 19 namespace views { | 16 namespace views { |
| 20 | 17 |
| 21 // static | 18 // static |
| 22 const char NativeScrollBar::kViewClassName[] = "NativeScrollBar"; | 19 const char NativeScrollBar::kViewClassName[] = "NativeScrollBar"; |
| 23 | 20 |
| 24 //////////////////////////////////////////////////////////////////////////////// | 21 //////////////////////////////////////////////////////////////////////////////// |
| 25 // NativeScrollBar, public: | 22 // NativeScrollBar, public: |
| 26 NativeScrollBar::NativeScrollBar(bool is_horizontal) | 23 NativeScrollBar::NativeScrollBar(bool is_horizontal) |
| 27 : ScrollBar(is_horizontal), | 24 : ScrollBar(is_horizontal), |
| 28 native_wrapper_(NULL) { | 25 native_wrapper_(NULL) { |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 108 } | 105 } |
| 109 | 106 |
| 110 int NativeScrollBar::GetPosition() const { | 107 int NativeScrollBar::GetPosition() const { |
| 111 if (!native_wrapper_) | 108 if (!native_wrapper_) |
| 112 return 0; | 109 return 0; |
| 113 return native_wrapper_->GetPosition(); | 110 return native_wrapper_->GetPosition(); |
| 114 } | 111 } |
| 115 | 112 |
| 116 } // namespace views | 113 } // namespace views |
| 117 | 114 |
| OLD | NEW |