| Index: ash/common/system/tray/tray_details_view.h
|
| diff --git a/ash/common/system/tray/tray_details_view.h b/ash/common/system/tray/tray_details_view.h
|
| index 4668d46824950468e22a16f45cea440b8858bf78..b7021d6606d00ac9d7e4e935865907883613fd03 100644
|
| --- a/ash/common/system/tray/tray_details_view.h
|
| +++ b/ash/common/system/tray/tray_details_view.h
|
| @@ -23,6 +23,7 @@ namespace views {
|
| class BoxLayout;
|
| class CustomButton;
|
| class ProgressBar;
|
| +class ScrollView;
|
| } // namespace views
|
|
|
| namespace ash {
|
| @@ -30,7 +31,6 @@ namespace test {
|
| class TrayDetailsViewTest;
|
| } // namespace test
|
|
|
| -class FixedSizedScrollView;
|
| class ScrollBorder;
|
| class SystemTrayItem;
|
| class TriView;
|
| @@ -52,7 +52,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
|
|
|
| SystemTrayItem* owner() { return owner_; }
|
| SpecialPopupRow* title_row() { return title_row_; }
|
| - FixedSizedScrollView* scroller() { return scroller_; }
|
| + views::ScrollView* scroller() { return scroller_; }
|
| views::View* scroll_content() { return scroll_content_; }
|
|
|
| protected:
|
| @@ -124,7 +124,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
|
| SystemTrayItem* owner_;
|
| views::BoxLayout* box_layout_;
|
| SpecialPopupRow* title_row_; // Not used in material design.
|
| - FixedSizedScrollView* scroller_;
|
| + views::ScrollView* scroller_;
|
| views::View* scroll_content_;
|
| views::ProgressBar* progress_bar_;
|
|
|
|
|