| Index: ui/views/layout/grid_layout.h
|
| diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h
|
| index ad228d5ce4a7ce8598ca13a341c4367d5faa71e7..20084c00e0ced755daa88cbf834d9a50f69ddfb4 100644
|
| --- a/ui/views/layout/grid_layout.h
|
| +++ b/ui/views/layout/grid_layout.h
|
| @@ -100,7 +100,7 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
|
| };
|
|
|
| explicit GridLayout(View* host);
|
| - virtual ~GridLayout();
|
| + ~GridLayout() override;
|
|
|
| // Creates a GridLayout with kPanel*Margin insets.
|
| static GridLayout* CreatePanel(View* host);
|
| @@ -162,26 +162,25 @@ class VIEWS_EXPORT GridLayout : public LayoutManager {
|
|
|
| // Notification we've been installed on a particular host. Checks that host
|
| // is the same as the View supplied in the constructor.
|
| - virtual void Installed(View* host) override;
|
| + void Installed(View* host) override;
|
|
|
| // Notification we've been uninstalled on a particular host. Checks that host
|
| // is the same as the View supplied in the constructor.
|
| - virtual void Uninstalled(View* host) override;
|
| + void Uninstalled(View* host) override;
|
|
|
| // Notification that a view has been added.
|
| - virtual void ViewAdded(View* host, View* view) override;
|
| + void ViewAdded(View* host, View* view) override;
|
|
|
| // Notification that a view has been removed.
|
| - virtual void ViewRemoved(View* host, View* view) override;
|
| + void ViewRemoved(View* host, View* view) override;
|
|
|
| // Layouts out the components.
|
| - virtual void Layout(View* host) override;
|
| + void Layout(View* host) override;
|
|
|
| // Returns the preferred size for the GridLayout.
|
| - virtual gfx::Size GetPreferredSize(const View* host) const override;
|
| + gfx::Size GetPreferredSize(const View* host) const override;
|
|
|
| - virtual int GetPreferredHeightForWidth(const View* host,
|
| - int width) const override;
|
| + int GetPreferredHeightForWidth(const View* host, int width) const override;
|
|
|
| void set_minimum_size(const gfx::Size& size) { minimum_size_ = size; }
|
|
|
|
|