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

Unified Diff: athena/wm/split_view_controller.h

Issue 641683003: C++11 override style change for athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src@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: athena/wm/split_view_controller.h
diff --git a/athena/wm/split_view_controller.h b/athena/wm/split_view_controller.h
index fa87734515ed91b033f17688e9543b9ce3c16b13..e3361c887ebcc897891bc288d938edcfad2360c4 100644
--- a/athena/wm/split_view_controller.h
+++ b/athena/wm/split_view_controller.h
@@ -42,7 +42,7 @@ class ATHENA_EXPORT SplitViewController
SplitViewController(aura::Window* container,
WindowListProvider* window_list_provider);
- virtual ~SplitViewController();
+ ~SplitViewController() override;
bool CanActivateSplitViewMode() const;
bool IsSplitViewModeActive() const;
@@ -115,22 +115,22 @@ class ATHENA_EXPORT SplitViewController
float GetMinFlingVelocityForTest() const;
// BezelController::ScrollDelegate:
- virtual void BezelScrollBegin(BezelController::Bezel bezel,
+ void BezelScrollBegin(BezelController::Bezel bezel,
float delta) override;
- virtual void BezelScrollEnd(float velocity) override;
- virtual void BezelScrollUpdate(float delta) override;
- virtual bool BezelCanScroll() override;
+ void BezelScrollEnd(float velocity) override;
+ void BezelScrollUpdate(float delta) override;
+ bool BezelCanScroll() override;
// DragHandleScrollDelegate:
- virtual void HandleScrollBegin(float delta) override;
- virtual void HandleScrollEnd(float velocity) override;
- virtual void HandleScrollUpdate(float delta) override;
+ void HandleScrollBegin(float delta) override;
+ void HandleScrollEnd(float velocity) override;
+ void HandleScrollUpdate(float delta) override;
// WindowManagerObserver:
- virtual void OnOverviewModeEnter() override;
- virtual void OnOverviewModeExit() override;
- virtual void OnSplitViewModeEnter() override;
- virtual void OnSplitViewModeExit() override;
+ void OnOverviewModeEnter() override;
+ void OnOverviewModeExit() override;
+ void OnSplitViewModeEnter() override;
+ void OnSplitViewModeExit() override;
State state_;

Powered by Google App Engine
This is Rietveld 408576698