| Index: ash/common/system/tray/fixed_sized_scroll_view.cc
|
| diff --git a/ash/common/system/tray/fixed_sized_scroll_view.cc b/ash/common/system/tray/fixed_sized_scroll_view.cc
|
| index dfa53f12887f2546f7b7d62025167ef86097e900..f63f84bd008833b8038d6093a63a848e19da1c2c 100644
|
| --- a/ash/common/system/tray/fixed_sized_scroll_view.cc
|
| +++ b/ash/common/system/tray/fixed_sized_scroll_view.cc
|
| @@ -10,8 +10,7 @@ FixedSizedScrollView::FixedSizedScrollView() {
|
| set_notify_enter_exit_on_child(true);
|
| }
|
|
|
| -FixedSizedScrollView::~FixedSizedScrollView() {
|
| -}
|
| +FixedSizedScrollView::~FixedSizedScrollView() {}
|
|
|
| void FixedSizedScrollView::SetContentsView(views::View* view) {
|
| SetContents(view);
|
| @@ -26,8 +25,8 @@ void FixedSizedScrollView::SetFixedSize(const gfx::Size& size) {
|
| }
|
|
|
| gfx::Size FixedSizedScrollView::GetPreferredSize() const {
|
| - gfx::Size size = fixed_size_.IsEmpty() ?
|
| - contents()->GetPreferredSize() : fixed_size_;
|
| + gfx::Size size =
|
| + fixed_size_.IsEmpty() ? contents()->GetPreferredSize() : fixed_size_;
|
| gfx::Insets insets = GetInsets();
|
| size.Enlarge(insets.width(), insets.height());
|
| return size;
|
|
|