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/native_control.cc | |
| 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/native_control.cc')
| -rw-r--r-- | views/controls/native_control.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index 69d8670..961066d 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -159,7 +159,7 @@ class NativeControlContainer : public CWindowImpl<NativeControlContainer, NativeControl* parent_; HWND control_; - DISALLOW_EVIL_CONSTRUCTORS(NativeControlContainer); + DISALLOW_COPY_AND_ASSIGN(NativeControlContainer); }; NativeControl::NativeControl() : hwnd_view_(NULL), @@ -320,13 +320,13 @@ void NativeControl::VisibilityChanged(View* starting_from, bool is_visible) { } void NativeControl::SetFixedWidth(int width, Alignment alignment) { - DCHECK(width > 0); + DCHECK_GT(width, 0); fixed_width_ = width; horizontal_alignment_ = alignment; } void NativeControl::SetFixedHeight(int height, Alignment alignment) { - DCHECK(height > 0); + DCHECK_GT(height, 0); fixed_height_ = height; vertical_alignment_ = alignment; } |