| Index: views/controls/button/image_button.h
|
| diff --git a/views/controls/button/image_button.h b/views/controls/button/image_button.h
|
| index 7ac6a293af762b27dd0536cd795c8d8cbbf1b68a..01daf0f164848ed51c8a5caa5e7c12457d12b398 100644
|
| --- a/views/controls/button/image_button.h
|
| +++ b/views/controls/button/image_button.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| @@ -43,8 +43,7 @@ class ImageButton : public CustomButton {
|
| VerticalAlignment v_align);
|
|
|
| // Overridden from View:
|
| - virtual gfx::Size GetPreferredSize();
|
| - virtual void OnPaint(gfx::Canvas* canvas);
|
| + virtual gfx::Size GetPreferredSize() OVERRIDE;
|
|
|
| // Sets preferred size, so it could be correctly positioned in layout even if
|
| // it is NULL.
|
| @@ -57,6 +56,9 @@ class ImageButton : public CustomButton {
|
| // from images.
|
| virtual SkBitmap GetImageToPaint();
|
|
|
| + // Overridden from View:
|
| + virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
|
| +
|
| // The images used to render the different states of this button.
|
| SkBitmap images_[BS_COUNT];
|
|
|
|
|