summaryrefslogtreecommitdiffstats
path: root/views/controls/native_control.cc
diff options
context:
space:
mode:
Diffstat (limited to 'views/controls/native_control.cc')
-rw-r--r--views/controls/native_control.cc6
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;
}