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

Unified Diff: ash/frame/custom_frame_view_ash.cc

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
« 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 f4422fc796e412210b6de7c1f931a5c06d13b326..8cdb02608663f1c7b654fc01d611716bb95742c9 100644
--- a/ash/frame/custom_frame_view_ash.cc
+++ b/ash/frame/custom_frame_view_ash.cc
@@ -74,7 +74,7 @@ class CustomFrameViewAshWindowStateDelegate
}
private:
// Overridden from ash::wm::WindowStateDelegate:
- virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {
+ virtual 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,7 +90,7 @@ class CustomFrameViewAshWindowStateDelegate
return true;
}
// Overridden from aura::WindowObserver:
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
+ virtual void OnWindowDestroying(aura::Window* window) override {
window_state_->RemoveObserver(this);
window_state_->window()->RemoveObserver(this);
window_state_ = NULL;
@@ -98,7 +98,7 @@ class CustomFrameViewAshWindowStateDelegate
// Overridden from ash::wm::WindowStateObserver:
virtual void OnPostWindowStateTypeChange(
ash::wm::WindowState* window_state,
- ash::wm::WindowStateType old_type) OVERRIDE {
+ ash::wm::WindowStateType old_type) override {
if (!window_state->IsFullscreen() &&
!window_state->IsMinimized() &&
immersive_fullscreen_controller_.get() &&
@@ -154,13 +154,13 @@ class CustomFrameViewAsh::HeaderView
void SizeConstraintsChanged();
// views::View:
- virtual void Layout() OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
- virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
+ virtual void Layout() override;
+ virtual void OnPaint(gfx::Canvas* canvas) override;
+ virtual void ChildPreferredSizeChanged(views::View* child) override;
// ShellObserver:
- virtual void OnMaximizeModeStarted() OVERRIDE;
- virtual void OnMaximizeModeEnded() OVERRIDE;
+ virtual void OnMaximizeModeStarted() override;
+ virtual void OnMaximizeModeEnded() override;
FrameCaptionButtonContainerView* caption_button_container() {
return caption_button_container_;
@@ -172,11 +172,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;
+ 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;
// The widget that the caption buttons act on.
views::Widget* frame_;
@@ -373,12 +373,12 @@ class CustomFrameViewAsh::OverlayView : public views::View,
virtual ~OverlayView();
// views::View:
- virtual void Layout() OVERRIDE;
+ virtual void Layout() override;
private:
// views::ViewTargeterDelegate:
virtual bool DoesIntersectRect(const views::View* target,
- const gfx::Rect& rect) const OVERRIDE;
+ 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