| Index: ash/common/system/tray/tray_background_view.h
|
| diff --git a/ash/common/system/tray/tray_background_view.h b/ash/common/system/tray/tray_background_view.h
|
| index 4932427c45d3dcb982aaad57535f7843cdbeea44..cb22ed649c3838b98a402bd197f156133da76f4f 100644
|
| --- a/ash/common/system/tray/tray_background_view.h
|
| +++ b/ash/common/system/tray/tray_background_view.h
|
| @@ -41,13 +41,8 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
|
|
| void SetAlignment(ShelfAlignment alignment);
|
|
|
| - void set_size(const gfx::Size& size) { size_ = size; }
|
| -
|
| void SetMargin(int main_axis_margin, int cross_axis_margin);
|
|
|
| - // views::View:
|
| - gfx::Size GetPreferredSize() const override;
|
| -
|
| protected:
|
| // views::View:
|
| void ChildPreferredSizeChanged(views::View* child) override;
|
| @@ -59,7 +54,6 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
|
| void UpdateLayout();
|
|
|
| ShelfAlignment alignment_;
|
| - gfx::Size size_;
|
| int main_axis_margin_ = 0;
|
| int cross_axis_margin_ = 0;
|
|
|
|
|