| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 CC_LAYERS_SCROLLBAR_LAYER_H_ | 5 #ifndef CC_LAYERS_SCROLLBAR_LAYER_H_ |
| 6 #define CC_LAYERS_SCROLLBAR_LAYER_H_ | 6 #define CC_LAYERS_SCROLLBAR_LAYER_H_ |
| 7 | 7 |
| 8 #include "cc/base/cc_export.h" | 8 #include "cc/base/cc_export.h" |
| 9 |
| 10 #if USE_REGULAR_SCROLLBAR |
| 11 |
| 9 #include "cc/input/scrollbar.h" | 12 #include "cc/input/scrollbar.h" |
| 10 #include "cc/layers/contents_scaling_layer.h" | 13 #include "cc/layers/contents_scaling_layer.h" |
| 11 #include "cc/layers/scrollbar_theme_painter.h" | 14 #include "cc/layers/scrollbar_theme_painter.h" |
| 12 #include "cc/resources/layer_updater.h" | 15 #include "cc/resources/layer_updater.h" |
| 13 | 16 |
| 14 namespace cc { | 17 namespace cc { |
| 15 class CachingBitmapContentLayerUpdater; | 18 class CachingBitmapContentLayerUpdater; |
| 16 class ResourceUpdateQueue; | 19 class ResourceUpdateQueue; |
| 17 class ScrollbarThemeComposite; | 20 class ScrollbarThemeComposite; |
| 18 | 21 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 | 87 |
| 85 // All the parts of the scrollbar except the thumb | 88 // All the parts of the scrollbar except the thumb |
| 86 scoped_ptr<LayerUpdater::Resource> track_; | 89 scoped_ptr<LayerUpdater::Resource> track_; |
| 87 scoped_ptr<LayerUpdater::Resource> thumb_; | 90 scoped_ptr<LayerUpdater::Resource> thumb_; |
| 88 | 91 |
| 89 DISALLOW_COPY_AND_ASSIGN(ScrollbarLayer); | 92 DISALLOW_COPY_AND_ASSIGN(ScrollbarLayer); |
| 90 }; | 93 }; |
| 91 | 94 |
| 92 } // namespace cc | 95 } // namespace cc |
| 93 | 96 |
| 97 #else |
| 98 |
| 99 #include "cc/layers/picture_scrollbar_layer.h" |
| 100 |
| 101 #endif |
| 102 |
| 94 #endif // CC_LAYERS_SCROLLBAR_LAYER_H_ | 103 #endif // CC_LAYERS_SCROLLBAR_LAYER_H_ |
| OLD | NEW |