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

Unified Diff: ash/frame/custom_frame_view_ash.cc

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
« no previous file with comments | « ash/frame/custom_frame_view_ash.h ('k') | ash/frame/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/custom_frame_view_ash.cc
diff --git a/ash/frame/custom_frame_view_ash.cc b/ash/frame/custom_frame_view_ash.cc
index 8f0781db4c4d129d647740eba75689e4717900b2..27a966186baaa156d5f42ad372d7a607eb8edc73 100644
--- a/ash/frame/custom_frame_view_ash.cc
+++ b/ash/frame/custom_frame_view_ash.cc
@@ -66,7 +66,7 @@ class CustomFrameViewAshWindowStateDelegate
window_state_->AddObserver(this);
window_state_->window()->AddObserver(this);
}
- virtual ~CustomFrameViewAshWindowStateDelegate() {
+ ~CustomFrameViewAshWindowStateDelegate() override {
if (window_state_) {
window_state_->RemoveObserver(this);
window_state_->window()->RemoveObserver(this);
@@ -74,7 +74,7 @@ class CustomFrameViewAshWindowStateDelegate
}
private:
// Overridden from ash::wm::WindowStateDelegate:
- virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) override {
+ bool ToggleFullscreen(ash::wm::WindowState* window_state) override {
bool enter_fullscreen = !window_state->IsFullscreen();
if (enter_fullscreen) {
window_state->window()->SetProperty(aura::client::kShowStateKey,
@@ -90,15 +90,14 @@ class CustomFrameViewAshWindowStateDelegate
return true;
}
// Overridden from aura::WindowObserver:
- virtual void OnWindowDestroying(aura::Window* window) override {
+ void OnWindowDestroying(aura::Window* window) override {
window_state_->RemoveObserver(this);
window_state_->window()->RemoveObserver(this);
window_state_ = NULL;
}
// Overridden from ash::wm::WindowStateObserver:
- virtual void OnPostWindowStateTypeChange(
- ash::wm::WindowState* window_state,
- ash::wm::WindowStateType old_type) override {
+ void OnPostWindowStateTypeChange(ash::wm::WindowState* window_state,
+ ash::wm::WindowStateType old_type) override {
if (!window_state->IsFullscreen() &&
!window_state->IsMinimized() &&
immersive_fullscreen_controller_.get() &&
@@ -132,7 +131,7 @@ class CustomFrameViewAsh::HeaderView
public:
// |frame| is the widget that the caption buttons act on.
explicit HeaderView(views::Widget* frame);
- virtual ~HeaderView();
+ ~HeaderView() override;
// Schedules a repaint for the entire title.
void SchedulePaintForTitle();
@@ -156,13 +155,13 @@ class CustomFrameViewAsh::HeaderView
void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
// views::View:
- virtual void Layout() override;
- virtual void OnPaint(gfx::Canvas* canvas) override;
- virtual void ChildPreferredSizeChanged(views::View* child) override;
+ void Layout() override;
+ void OnPaint(gfx::Canvas* canvas) override;
+ void ChildPreferredSizeChanged(views::View* child) override;
// ShellObserver:
- virtual void OnMaximizeModeStarted() override;
- virtual void OnMaximizeModeEnded() override;
+ void OnMaximizeModeStarted() override;
+ void OnMaximizeModeEnded() override;
FrameCaptionButtonContainerView* caption_button_container() {
return caption_button_container_;
@@ -174,11 +173,11 @@ class CustomFrameViewAsh::HeaderView
private:
// ImmersiveFullscreenController::Delegate:
- virtual void OnImmersiveRevealStarted() override;
- virtual void OnImmersiveRevealEnded() override;
- virtual void OnImmersiveFullscreenExited() override;
- virtual void SetVisibleFraction(double visible_fraction) override;
- virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
+ void OnImmersiveRevealStarted() override;
+ void OnImmersiveRevealEnded() override;
+ void OnImmersiveFullscreenExited() override;
+ void SetVisibleFraction(double visible_fraction) override;
+ std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
// The widget that the caption buttons act on.
views::Widget* frame_;
@@ -372,15 +371,15 @@ class CustomFrameViewAsh::OverlayView : public views::View,
public views::ViewTargeterDelegate {
public:
explicit OverlayView(HeaderView* header_view);
- virtual ~OverlayView();
+ ~OverlayView() override;
// views::View:
- virtual void Layout() override;
+ void Layout() override;
private:
// views::ViewTargeterDelegate:
- virtual bool DoesIntersectRect(const views::View* target,
- const gfx::Rect& rect) const override;
+ bool DoesIntersectRect(const views::View* target,
+ const gfx::Rect& rect) const override;
HeaderView* header_view_;
« no previous file with comments | « ash/frame/custom_frame_view_ash.h ('k') | ash/frame/custom_frame_view_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698