| 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 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ |    5 #ifndef UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ | 
|    6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ |    6 #define UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ | 
|    7  |    7  | 
|    8 #include "base/gtest_prod_util.h" |    8 #include "base/gtest_prod_util.h" | 
|    9 #include "base/macros.h" |    9 #include "base/macros.h" | 
|   10 #include "ui/views/animation/scroll_animator.h" |   10 #include "ui/views/animation/scroll_animator.h" | 
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   71   bool OnKeyPressed(const ui::KeyEvent& event) override; |   71   bool OnKeyPressed(const ui::KeyEvent& event) override; | 
|   72   bool OnMouseWheel(const ui::MouseWheelEvent& event) override; |   72   bool OnMouseWheel(const ui::MouseWheelEvent& event) override; | 
|   73  |   73  | 
|   74   // ui::EventHandler overrides: |   74   // ui::EventHandler overrides: | 
|   75   void OnGestureEvent(ui::GestureEvent* event) override; |   75   void OnGestureEvent(ui::GestureEvent* event) override; | 
|   76  |   76  | 
|   77   // ScrollBar overrides: |   77   // ScrollBar overrides: | 
|   78   void Update(int viewport_size, |   78   void Update(int viewport_size, | 
|   79               int content_size, |   79               int content_size, | 
|   80               int contents_scroll_offset) override; |   80               int contents_scroll_offset) override; | 
|   81   int GetLayoutSize() const override = 0; |  | 
|   82   int GetPosition() const override; |   81   int GetPosition() const override; | 
 |   82   int GetThickness() const override = 0; | 
 |   83   bool OverlapsContent() const override; | 
|   83  |   84  | 
|   84   // ScrollDelegate overrides: |   85   // ScrollDelegate overrides: | 
|   85   bool OnScroll(float dx, float dy) override; |   86   bool OnScroll(float dx, float dy) override; | 
|   86  |   87  | 
|   87   // ContextMenuController overrides: |   88   // ContextMenuController overrides: | 
|   88   void ShowContextMenuForView(View* source, |   89   void ShowContextMenuForView(View* source, | 
|   89                               const gfx::Point& point, |   90                               const gfx::Point& point, | 
|   90                               ui::MenuSourceType source_type) override; |   91                               ui::MenuSourceType source_type) override; | 
|   91  |   92  | 
|   92   // Menu::Delegate overrides: |   93   // Menu::Delegate overrides: | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  173   // TODO(tdresser): This should be removed when raw pixel scrolling for views |  174   // TODO(tdresser): This should be removed when raw pixel scrolling for views | 
|  174   // is enabled. See crbug.com/329354. |  175   // is enabled. See crbug.com/329354. | 
|  175   gfx::Vector2dF roundoff_error_; |  176   gfx::Vector2dF roundoff_error_; | 
|  176  |  177  | 
|  177   DISALLOW_COPY_AND_ASSIGN(BaseScrollBar); |  178   DISALLOW_COPY_AND_ASSIGN(BaseScrollBar); | 
|  178 }; |  179 }; | 
|  179  |  180  | 
|  180 }  // namespace views |  181 }  // namespace views | 
|  181  |  182  | 
|  182 #endif  // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ |  183 #endif  // UI_VIEWS_CONTROLS_SCROLLBAR_BASE_SCROLL_BAR_H_ | 
| OLD | NEW |