| Index: ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
|
| diff --git a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
|
| index 3fade7bb98040b7ea7d1a28ef917e7a7ca02b5c1..ab5bacca678303133d60f677fd7b38d263b8d6e6 100644
|
| --- a/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
|
| +++ b/ash/common/system/chromeos/bluetooth/tray_bluetooth.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "ash/common/material_design/material_design_controller.h"
|
| #include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/system/tray/fixed_sized_scroll_view.h"
|
| #include "ash/common/system/tray/hover_highlight_view.h"
|
| #include "ash/common/system/tray/system_tray.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| @@ -34,6 +33,7 @@
|
| #include "ui/views/controls/image_view.h"
|
| #include "ui/views/controls/label.h"
|
| #include "ui/views/controls/progress_bar.h"
|
| +#include "ui/views/controls/scroll_view.h"
|
| #include "ui/views/controls/separator.h"
|
| #include "ui/views/layout/box_layout.h"
|
|
|
| @@ -497,7 +497,7 @@ class BluetoothDetailedView : public TrayDetailsView {
|
| container->AddCheckableLabel(display_name, true /* highlight */, false);
|
| }
|
| scroll_content()->SizeToPreferredSize();
|
| - static_cast<views::View*>(scroller())->Layout();
|
| + scroller()->Layout();
|
| }
|
| }
|
|
|
|
|