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

Unified Diff: ui/views/controls/button/image_button.h

Issue 681753004: Standardize usage of virtual/override/final specifiers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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
« no previous file with comments | « ui/views/controls/button/custom_button_unittest.cc ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/image_button.h
diff --git a/ui/views/controls/button/image_button.h b/ui/views/controls/button/image_button.h
index dc861c4207d4b5ea391eba1efe5cb7c59498a2c4..bb3f526fea95093eb0d6e714fd29b9ceb6fbbc45 100644
--- a/ui/views/controls/button/image_button.h
+++ b/ui/views/controls/button/image_button.h
@@ -38,7 +38,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
};
explicit ImageButton(ButtonListener* listener);
- virtual ~ImageButton();
+ ~ImageButton() override;
// Returns the image for a given |state|.
virtual const gfx::ImageSkia& GetImage(ButtonState state) const;
@@ -69,14 +69,14 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
}
// Overridden from View:
- virtual gfx::Size GetPreferredSize() const override;
- virtual const char* GetClassName() const override;
- virtual void OnPaint(gfx::Canvas* canvas) override;
+ gfx::Size GetPreferredSize() const override;
+ const char* GetClassName() const override;
+ void OnPaint(gfx::Canvas* canvas) override;
protected:
// Overridden from View:
- virtual void OnFocus() override;
- virtual void OnBlur() override;
+ void OnFocus() override;
+ void OnBlur() override;
// Returns the image to paint. This is invoked from paint and returns a value
// from images.
@@ -127,7 +127,7 @@ class VIEWS_EXPORT ImageButton : public CustomButton {
class VIEWS_EXPORT ToggleImageButton : public ImageButton {
public:
explicit ToggleImageButton(ButtonListener* listener);
- virtual ~ToggleImageButton();
+ ~ToggleImageButton() override;
// Change the toggled state.
void SetToggled(bool toggled);
@@ -141,14 +141,13 @@ class VIEWS_EXPORT ToggleImageButton : public ImageButton {
void SetToggledTooltipText(const base::string16& tooltip);
// Overridden from ImageButton:
- virtual const gfx::ImageSkia& GetImage(ButtonState state) const override;
- virtual void SetImage(ButtonState state,
- const gfx::ImageSkia* image) override;
+ const gfx::ImageSkia& GetImage(ButtonState state) const override;
+ void SetImage(ButtonState state, const gfx::ImageSkia* image) override;
// Overridden from View:
- virtual bool GetTooltipText(const gfx::Point& p,
- base::string16* tooltip) const override;
- virtual void GetAccessibleState(ui::AXViewState* state) override;
+ bool GetTooltipText(const gfx::Point& p,
+ base::string16* tooltip) const override;
+ void GetAccessibleState(ui::AXViewState* state) override;
private:
// The parent class's images_ member is used for the current images,
« no previous file with comments | « ui/views/controls/button/custom_button_unittest.cc ('k') | ui/views/controls/button/label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698