| Index: ui/views/controls/button/label_button.h
|
| diff --git a/ui/views/controls/button/label_button.h b/ui/views/controls/button/label_button.h
|
| index b06d0175e6370d65f3d71335b3173cab728f7024..df9910cd708388ece37f97fa9f9221b0e8a64810 100644
|
| --- a/ui/views/controls/button/label_button.h
|
| +++ b/ui/views/controls/button/label_button.h
|
| @@ -60,6 +60,9 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
| bool native_theme() const { return native_theme_; }
|
| void SetNativeTheme(bool native_theme);
|
|
|
| + // Overridden from View:
|
| + virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| +
|
| private:
|
| FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Init);
|
| FRIEND_TEST_ALL_PREFIXES(LabelButtonTest, Label);
|
| @@ -74,7 +77,6 @@ class VIEWS_EXPORT LabelButton : public CustomButton,
|
| virtual void StateChanged() OVERRIDE;
|
|
|
| // Overridden from View:
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| virtual void Layout() OVERRIDE;
|
| virtual std::string GetClassName() const OVERRIDE;
|
| virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
|
|
|