diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:07:00 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-01 23:07:00 +0000 |
| commit | 3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9 (patch) | |
| tree | 3ce2aba0fd25d8b37d61e58ae437107594f36d39 /views/controls/scroll_view.h | |
| parent | 894b4a7c7323f0132f3a9611cfb71fa7eed223ad (diff) | |
| download | chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.zip chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.tar.gz chromium_src-3984b4b1edee2b14b0ebd41d31fc9fedfc7a0ef9.tar.bz2 | |
Lands http://codereview.chromium.org/449003/show for Thiago:
views: replace the deprecated macro (DISALLOW_EVIL_CONSTRUCTORS).
Use DISALLOW_COPY_AND_ASSIGN instead, also fix some style issues
pointed by lint.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/449075
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33500 0039d316-1c4b-4281-b951-d872f2087c98
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 |