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/scrollbar | |
| 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/scrollbar')
| -rw-r--r-- | views/controls/scrollbar/bitmap_scroll_bar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.h b/views/controls/scrollbar/bitmap_scroll_bar.h index 1a3bc67..cb6603b 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.h +++ b/views/controls/scrollbar/bitmap_scroll_bar.h @@ -184,9 +184,9 @@ class BitmapScrollBar : public ScrollBar, // True if the scroll buttons at each end of the scroll bar should be shown. bool show_scroll_buttons_; - DISALLOW_EVIL_CONSTRUCTORS(BitmapScrollBar); + DISALLOW_COPY_AND_ASSIGN(BitmapScrollBar); }; } // namespace views -#endif // #ifndef VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_ +#endif // VIEWS_CONTROLS_SCROLLBAR_BITMAP_SCROLL_BAR_H_ |