diff options
Diffstat (limited to 'views/controls/scroll_view.h')
| -rw-r--r-- | views/controls/scroll_view.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/views/controls/scroll_view.h b/views/controls/scroll_view.h index 5a578cd..43853ad 100644 --- a/views/controls/scroll_view.h +++ b/views/controls/scroll_view.h @@ -5,6 +5,8 @@ #ifndef VIEWS_CONTROLS_SCROLL_VIEW_H_ #define VIEWS_CONTROLS_SCROLL_VIEW_H_ +#include <string> + #include "views/controls/scrollbar/scroll_bar.h" namespace views { @@ -129,7 +131,7 @@ class ScrollView : public View, // Resize corner. View* resize_corner_; - DISALLOW_EVIL_CONSTRUCTORS(ScrollView); + DISALLOW_COPY_AND_ASSIGN(ScrollView); }; // VariableRowHeightScrollHelper is intended for views that contain rows of @@ -178,7 +180,7 @@ class VariableRowHeightScrollHelper { private: Controller* controller_; - DISALLOW_EVIL_CONSTRUCTORS(VariableRowHeightScrollHelper); + DISALLOW_COPY_AND_ASSIGN(VariableRowHeightScrollHelper); }; // FixedRowHeightScrollHelper is intended for views that contain fixed height @@ -199,7 +201,7 @@ class FixedRowHeightScrollHelper : public VariableRowHeightScrollHelper { int top_margin_; int row_height_; - DISALLOW_EVIL_CONSTRUCTORS(FixedRowHeightScrollHelper); + DISALLOW_COPY_AND_ASSIGN(FixedRowHeightScrollHelper); }; } // namespace views |