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

Unified Diff: athena/wm/window_manager_impl.h

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master 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 | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/wm/window_manager_impl.h
diff --git a/athena/wm/window_manager_impl.h b/athena/wm/window_manager_impl.h
index 32e98315460f5b6b7ac78bcfd471d286aadf86dd..2edd856d230cf0d475f32d75286af3db0c8c175c 100644
--- a/athena/wm/window_manager_impl.h
+++ b/athena/wm/window_manager_impl.h
@@ -42,8 +42,8 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
void ToggleSplitView();
// WindowManager:
- virtual void ToggleOverview() OVERRIDE;
- virtual bool IsOverviewModeActive() OVERRIDE;
+ virtual void ToggleOverview() override;
+ virtual bool IsOverviewModeActive() override;
private:
friend class test::WindowManagerImplTestApi;
@@ -60,30 +60,30 @@ class ATHENA_EXPORT WindowManagerImpl : public WindowManager,
void InstallAccelerators();
// WindowManager:
- virtual void AddObserver(WindowManagerObserver* observer) OVERRIDE;
- virtual void RemoveObserver(WindowManagerObserver* observer) OVERRIDE;
- virtual void ToggleSplitViewForTest() OVERRIDE;
- virtual WindowListProvider* GetWindowListProvider() OVERRIDE;
+ virtual void AddObserver(WindowManagerObserver* observer) override;
+ virtual void RemoveObserver(WindowManagerObserver* observer) override;
+ virtual void ToggleSplitViewForTest() override;
+ virtual WindowListProvider* GetWindowListProvider() override;
// WindowOverviewModeDelegate:
- virtual void OnSelectWindow(aura::Window* window) OVERRIDE;
+ virtual void OnSelectWindow(aura::Window* window) override;
virtual void OnSelectSplitViewWindow(aura::Window* left,
aura::Window* right,
- aura::Window* to_activate) OVERRIDE;
+ aura::Window* to_activate) override;
// aura::WindowObserver:
- virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+ virtual void OnWindowDestroying(aura::Window* window) override;
// AcceleratorHandler:
- virtual bool IsCommandEnabled(int command_id) const OVERRIDE;
+ virtual bool IsCommandEnabled(int command_id) const override;
virtual bool OnAcceleratorFired(int command_id,
- const ui::Accelerator& accelerator) OVERRIDE;
+ const ui::Accelerator& accelerator) override;
// TitleDragControllerDelegate:
- virtual aura::Window* GetWindowBehind(aura::Window* window) OVERRIDE;
- virtual void OnTitleDragStarted(aura::Window* window) OVERRIDE;
- virtual void OnTitleDragCompleted(aura::Window* window) OVERRIDE;
- virtual void OnTitleDragCanceled(aura::Window* window) OVERRIDE;
+ virtual aura::Window* GetWindowBehind(aura::Window* window) override;
+ virtual void OnTitleDragStarted(aura::Window* window) override;
+ virtual void OnTitleDragCompleted(aura::Window* window) override;
+ virtual void OnTitleDragCanceled(aura::Window* window) override;
scoped_ptr<aura::Window> container_;
scoped_ptr<WindowListProvider> window_list_provider_;
« no previous file with comments | « athena/wm/window_list_provider_impl_unittest.cc ('k') | athena/wm/window_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698