Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Unified Diff: ash/common/system/tray/tray_details_view.h

Issue 2496873002: Try to fix layout of scroll views in TrayDetailsViews. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 98b2614dfb16b8dd5e7ec4eeb7605044cff4e07d..b1560053dbb2d37b6a9af2841395246bb8c3bb89 100644
--- a/ash/common/system/tray/tray_details_view.h
+++ b/ash/common/system/tray/tray_details_view.h
@@ -13,6 +13,7 @@
#include "ui/views/view.h"
namespace views {
+class BoxLayout;
class ScrollView;
class ProgressBar;
} // namespace views
@@ -49,6 +50,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
protected:
// views::View:
void Layout() override;
+ int GetHeightForWidth(int width) const override;
void OnPaintBorder(gfx::Canvas* canvas) override;
// Creates the row containing the back button and title. For material design
@@ -90,6 +92,7 @@ class ASH_EXPORT TrayDetailsView : public views::View,
void TransitionToDefaultView();
SystemTrayItem* owner_;
+ views::BoxLayout* box_layout_;
SpecialPopupRow* title_row_;
FixedSizedScrollView* scroller_;
views::View* scroll_content_;

Powered by Google App Engine
This is Rietveld 408576698