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

Unified Diff: ash/wm/immersive_fullscreen_controller.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
« no previous file with comments | « ash/wm/gestures/tray_gesture_handler.h ('k') | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/immersive_fullscreen_controller.h
diff --git a/ash/wm/immersive_fullscreen_controller.h b/ash/wm/immersive_fullscreen_controller.h
index 4f0b20b23315e5b4e95cf87e2735ff727d290804..47f2610f6587ce1f7ee444ae03029bfb668be419 100644
--- a/ash/wm/immersive_fullscreen_controller.h
+++ b/ash/wm/immersive_fullscreen_controller.h
@@ -126,34 +126,34 @@ class ASH_EXPORT ImmersiveFullscreenController
void SetupForTest();
// ui::EventHandler overrides:
- virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
- virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
- virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ virtual void OnMouseEvent(ui::MouseEvent* event) override;
+ virtual void OnTouchEvent(ui::TouchEvent* event) override;
+ virtual void OnGestureEvent(ui::GestureEvent* event) override;
// views::FocusChangeObserver overrides:
virtual void OnWillChangeFocus(views::View* focused_before,
- views::View* focused_now) OVERRIDE;
+ views::View* focused_now) override;
virtual void OnDidChangeFocus(views::View* focused_before,
- views::View* focused_now) OVERRIDE;
+ views::View* focused_now) override;
// views::WidgetObserver overrides:
- virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
+ virtual void OnWidgetDestroying(views::Widget* widget) override;
virtual void OnWidgetActivationChanged(views::Widget* widget,
- bool active) OVERRIDE;
+ bool active) override;
// gfx::AnimationDelegate overrides:
- 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;
// ::wm::TransientWindowObserver overrides:
virtual void OnTransientChildAdded(aura::Window* window,
- aura::Window* transient) OVERRIDE;
+ aura::Window* transient) override;
virtual void OnTransientChildRemoved(aura::Window* window,
- aura::Window* transient) OVERRIDE;
+ aura::Window* transient) override;
// ash::ImmersiveRevealedLock::Delegate overrides:
- virtual void LockRevealedState(AnimateReveal animate_reveal) OVERRIDE;
- virtual void UnlockRevealedState() OVERRIDE;
+ virtual void LockRevealedState(AnimateReveal animate_reveal) override;
+ virtual void UnlockRevealedState() override;
private:
friend class ImmersiveFullscreenControllerTest;
« no previous file with comments | « ash/wm/gestures/tray_gesture_handler.h ('k') | ash/wm/immersive_fullscreen_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698