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

Unified Diff: ash/frame/caption_buttons/frame_caption_button_container_view.h

Issue 683593003: 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
Index: ash/frame/caption_buttons/frame_caption_button_container_view.h
diff --git a/ash/frame/caption_buttons/frame_caption_button_container_view.h b/ash/frame/caption_buttons/frame_caption_button_container_view.h
index 818b8e31148ae7217a7b21bc0337130991ee05f2..1d915943ae37d09012e1c243ca5f719ce9ba9096 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -35,7 +35,7 @@ class ASH_EXPORT FrameCaptionButtonContainerView
// |frame| is the views::Widget that the caption buttons act on.
explicit FrameCaptionButtonContainerView(views::Widget* frame);
- virtual ~FrameCaptionButtonContainerView();
+ ~FrameCaptionButtonContainerView() override;
// For testing.
class ASH_EXPORT TestApi {
@@ -91,13 +91,13 @@ class ASH_EXPORT FrameCaptionButtonContainerView
void UpdateSizeButtonVisibility();
// views::View:
- virtual gfx::Size GetPreferredSize() const override;
- virtual void Layout() override;
- virtual const char* GetClassName() const override;
+ gfx::Size GetPreferredSize() const override;
+ void Layout() override;
+ const char* GetClassName() const override;
// Overridden from gfx::AnimationDelegate:
- virtual void AnimationEnded(const gfx::Animation* animation) override;
- virtual void AnimationProgressed(const gfx::Animation* animation) override;
+ void AnimationEnded(const gfx::Animation* animation) override;
+ void AnimationProgressed(const gfx::Animation* animation) override;
private:
friend class FrameCaptionButtonContainerViewTest;
@@ -129,20 +129,18 @@ class ASH_EXPORT FrameCaptionButtonContainerView
bool ShouldSizeButtonBeVisible() const;
// views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) override;
+ void ButtonPressed(views::Button* sender, const ui::Event& event) override;
// FrameSizeButtonDelegate:
- virtual bool IsMinimizeButtonVisible() const override;
- virtual void SetButtonsToNormal(Animate animate) override;
- virtual void SetButtonIcons(CaptionButtonIcon minimize_button_icon,
- CaptionButtonIcon close_button_icon,
- Animate animate) override;
- virtual const FrameCaptionButton* GetButtonClosestTo(
+ bool IsMinimizeButtonVisible() const override;
+ void SetButtonsToNormal(Animate animate) override;
+ void SetButtonIcons(CaptionButtonIcon minimize_button_icon,
+ CaptionButtonIcon close_button_icon,
+ Animate animate) override;
+ const FrameCaptionButton* GetButtonClosestTo(
const gfx::Point& position_in_screen) const override;
- virtual void SetHoveredAndPressedButtons(
- const FrameCaptionButton* to_hover,
- const FrameCaptionButton* to_press) override;
+ void SetHoveredAndPressedButtons(const FrameCaptionButton* to_hover,
+ const FrameCaptionButton* to_press) override;
// The widget that the buttons act on.
views::Widget* frame_;

Powered by Google App Engine
This is Rietveld 408576698