| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/system/tray/fixed_sized_scroll_view.h" | 5 #include "ash/common/system/tray/fixed_sized_scroll_view.h" |
| 6 | 6 |
| 7 namespace ash { | 7 namespace ash { |
| 8 | 8 |
| 9 FixedSizedScrollView::FixedSizedScrollView() { | 9 FixedSizedScrollView::FixedSizedScrollView() { |
| 10 set_notify_enter_exit_on_child(true); | 10 set_notify_enter_exit_on_child(true); |
| 11 } | 11 } |
| 12 | 12 |
| 13 FixedSizedScrollView::~FixedSizedScrollView() { | 13 FixedSizedScrollView::~FixedSizedScrollView() { |
| 14 } | 14 } |
| 15 | 15 |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 } | 51 } |
| 52 } | 52 } |
| 53 | 53 |
| 54 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) { | 54 void FixedSizedScrollView::OnBoundsChanged(const gfx::Rect& previous_bounds) { |
| 55 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize()); | 55 gfx::Rect bounds = gfx::Rect(contents()->GetPreferredSize()); |
| 56 bounds.set_width(std::max(0, width() - GetScrollBarWidth())); | 56 bounds.set_width(std::max(0, width() - GetScrollBarWidth())); |
| 57 contents()->SetBoundsRect(bounds); | 57 contents()->SetBoundsRect(bounds); |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace ash | 60 } // namespace ash |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2066583004:
mash: Move most files in //ash/system/tray to //ash/common/system/tray (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@trayupdatemove