| Index: ui/views/test/test_views.cc
|
| diff --git a/ui/views/test/test_views.cc b/ui/views/test/test_views.cc
|
| index 78239f384a4993997cda723d7da46b0b33fba3ef..d0ad7d53186134e23fd4e6e6f76a2b7f9ded69d7 100644
|
| --- a/ui/views/test/test_views.cc
|
| +++ b/ui/views/test/test_views.cc
|
| @@ -10,16 +10,17 @@
|
|
|
| namespace views {
|
|
|
| -StaticSizedView::StaticSizedView(const gfx::Size& preferred_size)
|
| +StaticSizedView::StaticSizedView(const gfx::Size& size)
|
| // Default GetMinimumSize() is GetPreferredSize(). Default GetMaximumSize()
|
| // is 0x0.
|
| - : preferred_size_(preferred_size),
|
| - minimum_size_(preferred_size) {}
|
| + : size_(size),
|
| + minimum_size_(size) {
|
| +}
|
|
|
| StaticSizedView::~StaticSizedView() {}
|
|
|
| gfx::Size StaticSizedView::GetPreferredSize() const {
|
| - return preferred_size_;
|
| + return size_;
|
| }
|
|
|
| gfx::Size StaticSizedView::GetMinimumSize() const {
|
|
|