| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/overlay_scroll_bar.h" | 5 #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "third_party/skia/include/core/SkColor.h" | 8 #include "third_party/skia/include/core/SkColor.h" |
| 9 #include "third_party/skia/include/core/SkXfermode.h" | |
| 10 #include "ui/compositor/scoped_layer_animation_settings.h" | 9 #include "ui/compositor/scoped_layer_animation_settings.h" |
| 11 #include "ui/gfx/canvas.h" | 10 #include "ui/gfx/canvas.h" |
| 12 #include "ui/views/background.h" | 11 #include "ui/views/background.h" |
| 13 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
| 14 | 13 |
| 15 namespace views { | 14 namespace views { |
| 16 namespace { | 15 namespace { |
| 17 | 16 |
| 18 // Total thickness of the thumb (matches visuals when hovered). | 17 // Total thickness of the thumb (matches visuals when hovered). |
| 19 const int kThumbThickness = 11; | 18 const int kThumbThickness = 11; |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 thumb_bounds.set_x(thumb->x()); | 151 thumb_bounds.set_x(thumb->x()); |
| 153 thumb_bounds.set_width(thumb->width()); | 152 thumb_bounds.set_width(thumb->width()); |
| 154 } else { | 153 } else { |
| 155 thumb_bounds.set_y(thumb->y()); | 154 thumb_bounds.set_y(thumb->y()); |
| 156 thumb_bounds.set_height(thumb->height()); | 155 thumb_bounds.set_height(thumb->height()); |
| 157 } | 156 } |
| 158 thumb->SetBoundsRect(thumb_bounds); | 157 thumb->SetBoundsRect(thumb_bounds); |
| 159 } | 158 } |
| 160 | 159 |
| 161 } // namespace views | 160 } // namespace views |
| OLD | NEW |