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

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

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (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 658df05ea637bd2fb2b726a54f759d860dc073ba..3b70fcb73c535af619ed90042a4d9f2a68b33c29 100644
--- a/ash/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/frame/caption_buttons/frame_caption_button_container_view.h
@@ -101,13 +101,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;
+ virtual gfx::Size GetPreferredSize() const override;
+ virtual void Layout() override;
+ virtual 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;
+ virtual void AnimationEnded(const gfx::Animation* animation) override;
+ virtual void AnimationProgressed(const gfx::Animation* animation) override;
private:
friend class FrameCaptionButtonContainerViewTest;
@@ -140,19 +140,19 @@ class ASH_EXPORT FrameCaptionButtonContainerView
// views::ButtonListener:
virtual void ButtonPressed(views::Button* sender,
- const ui::Event& event) OVERRIDE;
+ const ui::Event& event) override;
// FrameSizeButtonDelegate:
- virtual bool IsMinimizeButtonVisible() const OVERRIDE;
- virtual void SetButtonsToNormal(Animate animate) OVERRIDE;
+ 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;
+ Animate animate) override;
virtual const FrameCaptionButton* GetButtonClosestTo(
- const gfx::Point& position_in_screen) const OVERRIDE;
+ const gfx::Point& position_in_screen) const override;
virtual void SetHoveredAndPressedButtons(
const FrameCaptionButton* to_hover,
- const FrameCaptionButton* to_press) OVERRIDE;
+ const FrameCaptionButton* to_press) override;
// The widget that the buttons act on.
views::Widget* frame_;

Powered by Google App Engine
This is Rietveld 408576698